[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2496] trunk/LWJGL/src/native/common

[<eli...@us...>]

Revision: 2496
Author:   elias_naur
Date:     2006-07-12 09:55:05 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2496&view=rev

Log Message:
-----------
Windows: Use the standard _WIN32 macro instead of the LWJGL defined WIN32.

Modified Paths:
--------------
    trunk/LWJGL/platform_build/windows_ant/build.xml
    trunk/LWJGL/src/native/common/common_tools.c
Modified: trunk/LWJGL/platform_build/windows_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-11 23:03:11 UTC (rev 2495)
+++ trunk/LWJGL/platform_build/windows_ant/build.xml	2006-07-12 16:55:05 UTC (rev 2496)
@@ -11,7 +11,7 @@
 
 	<target name="compile_dir">
 		<apply dir="." failonerror="true" executable="cl" dest="." skipemptyfilesets="true">
-			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D WIN32 /c"/>
+			<arg line="/Ox /Wp64 /W2 /nologo /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /c"/>
 			<arg value="/I${sdkhome}\include"/>
 			<arg value="/I${dxhome}\include"/>
 			<arg value="/I${alhome}\include"/>

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-11 23:03:11 UTC (rev 2495)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-12 16:55:05 UTC (rev 2496)
@@ -40,7 +40,7 @@
 #include <jni.h>
 #include <stdlib.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <wtypes.h>
 #endif
 
@@ -82,7 +82,7 @@
 #define BUFFER_SIZE 4000
 	char buffer[BUFFER_SIZE];
 	jstring str;
-#ifdef WIN32
+#ifdef _WIN32
 	vsnprintf_s(buffer, BUFFER_SIZE, _TRUNCATE, format, ap);
 #else
 	vsnprintf(buffer, BUFFER_SIZE, format, ap);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.