Author: mturk
Date: Fri Nov 18 16:45:23 2011
New Revision: 1203737
URL: http://svn.apache.org/viewvc?rev=1203737&view=rev
Log:
_WIN32 and _WIN64 are predefined macros
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure.bat
Modified: commons/sandbox/runtime/trunk/src/main/native/configure.bat
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure.bat?rev=1203737&r1=1203736&r2=1203737&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure.bat (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure.bat Fri Nov 18
16:45:23 2011
@@ -41,7 +41,7 @@ set "BINDIR=bin"
set "LIBDIR=lib"
set "SHRDIR=share"
set "INCDIR=include/%NAME%-%VMAJOR%"
-set "CPPOPTS=-DWIN32 -D_WIN32 -DWINDOWS -D_WINDOWS -D_WIN32 -DWINNT -D_WINNT"
+set "CPPOPTS=-DWIN32 -DWINDOWS -D_WINDOWS -DWINNT -D_WINNT"
set "CPPOPTS=%CPPOPTS% -D_WIN32_WINNT=0x0502 -DWINVER=0x0502
-D_WIN32_IE=0x0600 -D_UNICODE -DUNICODE"
set "CCFLAGS=-nologo"
set "LDFLAGS=/NOLOGO /INCREMENTAL:NO /DEBUG"
@@ -188,7 +188,7 @@ set AS=ml
set CC_SIZEOF_VOIDP=8
set CC_SIZEOF_SIZE_T=8
set CC_SIZEOF_SSIZE_T=8
-set CPPOPTS=%CPPOPTS% -D%MCPU% -D_WIN64 -DWIN64
+set CPPOPTS=%CPPOPTS% -D%MCPU% -DWIN64
set AS=ml64
)
set RCFLAGS=%RCFLAGS% /d %MCPU% /d OCPR_COMPILE /d OCPR_API_EXPORT
