michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Elias Naur 2006-07-12 16:55:05 +00:00
parent 8a1952f2b0
commit 624f93ba34
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform_build/windows_ant/build.xml
View File

@ -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"/>

4
src/native/common/common_tools.c
View File

@ -40,7 +40,7 @@
#include <jni.h>
#include <stdlib.h>
#ifdef WIN32
#ifdef _WIN32
#include <wtypes.h>
#endif
@ -82,7 +82,7 @@ static jstring sprintfJavaString(JNIEnv *env, const char *format, va_list ap) {
#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);