Commit 6ddbc116 authored by Magnus Hagander's avatar Magnus Hagander

Make ECPG regression tests run with -c only for array_of_struct.pgc

on MSVC.

Fix strange nonstandard version of __stdcall specifyer in thread
tests on win32.
parent ebade3f5
...@@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void); ...@@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#ifdef WIN32 #ifdef WIN32
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -101,7 +101,7 @@ struct sqlca_t *ECPGget_sqlca(void); ...@@ -101,7 +101,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#if defined(ENABLE_THREAD_SAFETY) && defined(WIN32) #if defined(ENABLE_THREAD_SAFETY) && defined(WIN32)
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void); ...@@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#ifdef WIN32 #ifdef WIN32
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint; ...@@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint;
exec sql whenever not found sqlprint; exec sql whenever not found sqlprint;
#ifdef WIN32 #ifdef WIN32
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -17,7 +17,7 @@ EXEC SQL whenever sqlerror sqlprint; ...@@ -17,7 +17,7 @@ EXEC SQL whenever sqlerror sqlprint;
EXEC SQL whenever not found sqlprint; EXEC SQL whenever not found sqlprint;
#if defined(ENABLE_THREAD_SAFETY) && defined(WIN32) #if defined(ENABLE_THREAD_SAFETY) && defined(WIN32)
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint; ...@@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint;
exec sql whenever not found sqlprint; exec sql whenever not found sqlprint;
#ifdef WIN32 #ifdef WIN32
static unsigned STDCALL fn(void* arg) static unsigned __stdcall fn(void* arg)
#else #else
static void* fn(void* arg) static void* fn(void* arg)
#endif #endif
......
...@@ -33,9 +33,12 @@ ...@@ -33,9 +33,12 @@
<CreateProperty Value="-C INFORMIX -r no_indicator" Condition="'%(Pgc.FileName)'=='rnull'"> <CreateProperty Value="-C INFORMIX -r no_indicator" Condition="'%(Pgc.FileName)'=='rnull'">
<Output TaskParameter="Value" PropertyName="ECPGPARAM" /> <Output TaskParameter="Value" PropertyName="ECPGPARAM" />
</CreateProperty> </CreateProperty>
<CreateProperty Value="-c" Condition="'%(Pgc.FileName)'=='array_of_struct'">
<Output TaskParameter="Value" PropertyName="ECPGPARAM" />
</CreateProperty>
<!-- Run ECPG and the Visual C++ compiler on the files. Don't bother with dependency check between the steps --> <!-- Run ECPG and the Visual C++ compiler on the files. Don't bother with dependency check between the steps -->
<Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -c -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c %(Pgc.Filename).pgc" /> <Exec WorkingDirectory="%(Pgc.RelativeDir)" Command="$(OUTDIR)ecpg\ecpg -I ../../include --regression $(ECPGPARAM) -o %(Pgc.Filename).c %(Pgc.Filename).pgc" />
<Exec WorkingDirectorY="%(Pgc.RelativeDir)" Command="cl /nologo %(Pgc.FileName).c /TC /MD$(DEBUGLIB) /DENABLE_THREAD_SAFETY /DWIN32 /DWIN32_ONLY_COMPILER /I. /I..\..\include /I..\..\..\libpq /I..\..\..\..\include /link /defaultlib:$(OUTDIR)libecpg\libecpg.lib /defaultlib:$(OUTDIR)libecpg_compat\libecpg_compat.lib /defaultlib:$(OUTDIR)libpgtypes\libpgtypes.lib" /> <Exec WorkingDirectorY="%(Pgc.RelativeDir)" Command="cl /nologo %(Pgc.FileName).c /TC /MD$(DEBUGLIB) /DENABLE_THREAD_SAFETY /DWIN32 /DWIN32_ONLY_COMPILER /I. /I..\..\include /I..\..\..\libpq /I..\..\..\..\include /link /defaultlib:$(OUTDIR)libecpg\libecpg.lib /defaultlib:$(OUTDIR)libecpg_compat\libecpg_compat.lib /defaultlib:$(OUTDIR)libpgtypes\libpgtypes.lib" />
</Target> </Target>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment