From b0e40d189325dc7a54d2546245e766f8c47a7c8d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 11 Apr 2016 19:37:04 -0400 Subject: [PATCH] Fix two places that thought Windows64 is indicated by WIN64 macro. Everyplace else thinks it's _WIN64, so make these places fall in line. The pg_regress.c usage is not going to result in any change in behavior, only suppressing (or not) a compiler warning about downcasting HANDLEs. So there seems no need for back-patching there. The libpq/win32.mak usage might represent an actual bug, if anyone were using this script to build for Windows64, which perhaps nobody is. Given the lack of field complaints, no back-patch here either. pg_regress.c problem found by Christian Ullrich, the other by me. --- src/interfaces/libpq/win32.mak | 2 +- src/test/regress/pg_regress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 1b71ebd387..1d8c84d5a2 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -16,7 +16,7 @@ CPU=i386 !MESSAGE Building the Win32 static library... !MESSAGE !ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64") -ADD_DEFINES=/D "WIN64" /Wp64 /GS +ADD_DEFINES=/D "_WIN64" /Wp64 /GS ADD_SECLIB=bufferoverflowU.lib !MESSAGE Building the Win64 static library... !MESSAGE diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 167444591d..2f6f56dd40 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2386,7 +2386,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc postmaster_running = true; -#ifdef WIN64 +#ifdef _WIN64 /* need a series of two casts to convert HANDLE without compiler warning */ #define ULONGPID(x) (unsigned long) (unsigned long long) (x) #else -- 2.40.0