diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-03 11:01:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-03 11:01:08 -0400 |
| commit | 143fcf90b15884d8e20868996651b17ad333f8ee (patch) | |
| tree | a24674b95921cf9945a0a7894d98ccfb492b0e0d | |
| parent | b187702f8a74530f861c397153c22a3f4100300b (diff) | |
| download | postgresql-143fcf90b15884d8e20868996651b17ad333f8ee.tar.gz postgresql-143fcf90b15884d8e20868996651b17ad333f8ee.zip | |
Fix macro-redefinition warning on MSVC.
In commit 9d6b160d7, I tweaked pg_config.h.win32 to use
"#define HAVE_LONG_LONG_INT_64 1" rather than defining it as empty,
for consistency with what happens in an autoconf'd build.
But Solution.pm injects another definition of that macro into
ecpg_config.h, leading to justifiable (though harmless) compiler whining.
Make that one consistent too. Back-patch, like the previous patch.
Discussion: https://postgr.es/m/CAEepm=1dWsXROuSbRg8PbKLh0S=8Ou-V8sr05DxmJOF5chBxqQ@mail.gmail.com
| -rw-r--r-- | src/tools/msvc/Solution.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 1a05d68ba04..06893ee0ebc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -396,7 +396,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY || confess "Could not open ecpg_config.h"; print O <<EOF; #if (_MSC_VER > 1200) -#define HAVE_LONG_LONG_INT_64 +#define HAVE_LONG_LONG_INT_64 1 #define ENABLE_THREAD_SAFETY 1 EOF print O "#define USE_INTEGER_DATETIMES 1\n" |