summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2007-10-03 11:57:36 +0000
committerMagnus Hagander2007-10-03 11:57:36 +0000
commit6ddbc1164d221a54fccdc2cdb96bc8a921734c10 (patch)
treefb5bd2d13b65f050d6e668b7d4f5ac02bba2fc8f
parentebade3f5bfb032fa5e6e6c5f39e5e095f0228c39 (diff)
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.
-rw-r--r--src/interfaces/ecpg/test/expected/thread-alloc.c2
-rw-r--r--src/interfaces/ecpg/test/expected/thread-descriptor.c2
-rw-r--r--src/interfaces/ecpg/test/expected/thread-prep.c2
-rw-r--r--src/interfaces/ecpg/test/thread/alloc.pgc2
-rw-r--r--src/interfaces/ecpg/test/thread/descriptor.pgc2
-rw-r--r--src/interfaces/ecpg/test/thread/prep.pgc2
-rw-r--r--src/tools/msvc/ecpg_regression.proj5
7 files changed, 10 insertions, 7 deletions
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c
index 12a95df8f6..0f2979a255 100644
--- a/src/interfaces/ecpg/test/expected/thread-alloc.c
+++ b/src/interfaces/ecpg/test/expected/thread-alloc.c
@@ -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
diff --git a/src/interfaces/ecpg/test/expected/thread-descriptor.c b/src/interfaces/ecpg/test/expected/thread-descriptor.c
index 4bbed8c256..6fd0dd818b 100644
--- a/src/interfaces/ecpg/test/expected/thread-descriptor.c
+++ b/src/interfaces/ecpg/test/expected/thread-descriptor.c
@@ -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
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c
index 22b63f16fc..90d9dbc495 100644
--- a/src/interfaces/ecpg/test/expected/thread-prep.c
+++ b/src/interfaces/ecpg/test/expected/thread-prep.c
@@ -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
diff --git a/src/interfaces/ecpg/test/thread/alloc.pgc b/src/interfaces/ecpg/test/thread/alloc.pgc
index d4850dcd88..9c56c070c5 100644
--- a/src/interfaces/ecpg/test/thread/alloc.pgc
+++ b/src/interfaces/ecpg/test/thread/alloc.pgc
@@ -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
diff --git a/src/interfaces/ecpg/test/thread/descriptor.pgc b/src/interfaces/ecpg/test/thread/descriptor.pgc
index 7f7b4a1d0b..9560d105b6 100644
--- a/src/interfaces/ecpg/test/thread/descriptor.pgc
+++ b/src/interfaces/ecpg/test/thread/descriptor.pgc
@@ -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
diff --git a/src/interfaces/ecpg/test/thread/prep.pgc b/src/interfaces/ecpg/test/thread/prep.pgc
index 314e24eecd..0e822bb359 100644
--- a/src/interfaces/ecpg/test/thread/prep.pgc
+++ b/src/interfaces/ecpg/test/thread/prep.pgc
@@ -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
diff --git a/src/tools/msvc/ecpg_regression.proj b/src/tools/msvc/ecpg_regression.proj
index a026c5433c..cccd6bce2e 100644
--- a/src/tools/msvc/ecpg_regression.proj
+++ b/src/tools/msvc/ecpg_regression.proj
@@ -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>