From 93625aa8ac8ae64721229e6544adaaa00aaeb673 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Sun, 27 May 2007 11:16:41 +0000
Subject: [PATCH] Applied Joachim's patch for ecpg_config.h creation on Vista.
Changed variable test to not run into infinite loops on backend errors.
---
src/interfaces/ecpg/ChangeLog | 5 +++++
src/interfaces/ecpg/test/preproc/variable.pgc | 2 +-
src/tools/msvc/Solution.pm | 5 +++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index b866975d3fd..aacd2e26d0d 100644
--- 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
index 5836d6eb268..dcc575f8b4b 100644
--- 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
index 405f8d2d900..1a0c94fbf9c 100644
--- 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);
}
--
GitLab