mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
on MSVC.

Fix strange nonstandard version of __stdcall specifyer in thread
tests on win32.
This commit is contained in:
Magnus Hagander 2007-10-03 11:57:36 +00:00
parent ebade3f5bf
commit 6ddbc1164d
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/ecpg/test/expected/thread-alloc.c
View File

@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

2
src/interfaces/ecpg/test/expected/thread-descriptor.c
View File

@ -101,7 +101,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#if defined(ENABLE_THREAD_SAFETY) && defined(WIN32)
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

2
src/interfaces/ecpg/test/expected/thread-prep.c
View File

@ -121,7 +121,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

2
src/interfaces/ecpg/test/thread/alloc.pgc
View File

@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint;
exec sql whenever not found sqlprint;
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

2
src/interfaces/ecpg/test/thread/descriptor.pgc
View File

@ -17,7 +17,7 @@ EXEC SQL whenever sqlerror sqlprint;
EXEC SQL whenever not found sqlprint;
#if defined(ENABLE_THREAD_SAFETY) && defined(WIN32)
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

2
src/interfaces/ecpg/test/thread/prep.pgc
View File

@ -28,7 +28,7 @@ exec sql whenever sqlerror sqlprint;
exec sql whenever not found sqlprint;
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
static unsigned __stdcall fn(void* arg)
#else
static void* fn(void* arg)
#endif

5
src/tools/msvc/ecpg_regression.proj
View File

@ -33,9 +33,12 @@
<CreateProperty Value="-C INFORMIX -r no_indicator" Condition="'%(Pgc.FileName)'=='rnull'">
<Output TaskParameter="Value" PropertyName="ECPGPARAM" />
</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 -->
<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" />
</Target>