Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a4b0a4d

Browse files
committed
Fix macro-redefinition warning on MSVC.
In commit 9d6b160, 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
1 parent 991a5ba commit a4b0a4d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/msvc/Solution.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
419419
|| confess "Could not open ecpg_config.h";
420420
print O <<EOF;
421421
#if (_MSC_VER > 1200)
422-
#define HAVE_LONG_LONG_INT_64
422+
#define HAVE_LONG_LONG_INT_64 1
423423
#define ENABLE_THREAD_SAFETY 1
424424
EOF
425425
print O "#define USE_INTEGER_DATETIMES 1\n"

0 commit comments

Comments
 (0)