Applied Joachim's patch for ecpg_config.h creation on Vista.

Michael Meskes · Michael Meskes · commit 93625aa8ac8a · 2007-05-27T11:16:41.000Z
Changed variable test to not run into infinite loops on backend errors.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -2198,4 +2198,9 @@ Sun, 20 May 2007 22:01:11 +0200
 
 	- Do not try to find local timezone in DecodeDateTime() because the
 	  result is not used anyway. This also fixes Vista's build problems.
+
+Sun, 27 May 2007 13:14:39 +0200
+
+	- Changed variable test to not run into infinite loops on backend
+	  errors.
 	- Set ecpg version to 4.3.1.
diff --git a/src/interfaces/ecpg/test/preproc/variable.pgc b/src/interfaces/ecpg/test/preproc/variable.pgc
@@ -3,7 +3,7 @@
 
 exec sql include ../regression;
 
-exec sql whenever sqlerror sqlprint;
+exec sql whenever sqlerror stop;
 
 exec sql type c is char reference;
 typedef char* c;
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -3,7 +3,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.25 2007/05/15 01:57:57 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.26 2007/05/27 11:16:41 meskes Exp $
 #
 use Carp;
 use strict;
@@ -247,8 +247,9 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
 #if (_MSC_VER > 1200)
 #define HAVE_LONG_LONG_INT_64
 #define ENABLE_THREAD_SAFETY 1
-#endif
 EOF
+	print O "#define USE_INTEGER_DATETIMES 1\n" if ($self->{options}->{integer_datetimes});
+	print O "#endif\n";
         close(O);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.25 2007/05/15 01:57:57 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.26 2007/05/27 11:16:41 meskes Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -247,8 +247,9 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`247`	`247`	`#if (_MSC_VER > 1200)`
`248`	`248`	`#define HAVE_LONG_LONG_INT_64`
`249`	`249`	`#define ENABLE_THREAD_SAFETY 1`
`250`		`-#endif`
`251`	`250`	`EOF`
	`251`	`+ print O "#define USE_INTEGER_DATETIMES 1\n" if ($self->{options}->{integer_datetimes});`
	`252`	`+ print O "#endif\n";`
`252`	`253`	`close(O);`
`253`	`254`	`}`
`254`	`255`