postgres.git / summary / log / commit / refs

commit    1d30553aa2356e434062cd7bc3744579e97f328b
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sun Sep 03 15:01:08 2017 +0000
First released in: 11.0, 9.2.24, 9.3.20, 9.4.15, 9.5.10, 9.6.6, 10.0

    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


 src/tools/msvc/Solution.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 15be398c136..cb6f9bd24f3 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -392,7 +392,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"


[parent: 2efd54b45a89]