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

Commit b0e40d1

Browse files
committed
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.
1 parent 1d2f9de commit b0e40d1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/interfaces/libpq/win32.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CPU=i386
1616
!MESSAGE Building the Win32 static library...
1717
!MESSAGE
1818
!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
19-
ADD_DEFINES=/D "WIN64" /Wp64 /GS
19+
ADD_DEFINES=/D "_WIN64" /Wp64 /GS
2020
ADD_SECLIB=bufferoverflowU.lib
2121
!MESSAGE Building the Win64 static library...
2222
!MESSAGE

src/test/regress/pg_regress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2386,7 +2386,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
23862386

23872387
postmaster_running = true;
23882388

2389-
#ifdef WIN64
2389+
#ifdef _WIN64
23902390
/* need a series of two casts to convert HANDLE without compiler warning */
23912391
#define ULONGPID(x) (unsigned long) (unsigned long long) (x)
23922392
#else

0 commit comments

Comments
 (0)