aboutsummaryrefslogtreecommitdiffstats
path: root/src/native/windows
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-05-16 03:56:45 +0200
committerSven Gothel <[email protected]>2010-05-16 03:56:45 +0200
commit8e7d075002dba3f5d5971f9c31358f074934c624 (patch)
treeb9e58a49a9eb7c68dc9888c25e4347edcb0cf49e /src/native/windows
parentd86ab08912944bdd76bd91dcb86ffd291986cfc7 (diff)
GlueGen/JOGL Windows x86 x86_64 Builds
x86: Using mingw 20100514, gcc 4.5.0 - clean - passed all junit.run tests x86_64: Using mingw-w64-bin_x86_64-mingw_20100515_sezero.zip, gcc 4.4.5 20100513 - clean - passed most junit.run tests, still buggy
Diffstat (limited to 'src/native/windows')
-rwxr-xr-xsrc/native/windows/WindowsDynamicLinkerImpl_JNI.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/native/windows/WindowsDynamicLinkerImpl_JNI.c b/src/native/windows/WindowsDynamicLinkerImpl_JNI.c
index 5d30a30..b4a9787 100755
--- a/src/native/windows/WindowsDynamicLinkerImpl_JNI.c
+++ b/src/native/windows/WindowsDynamicLinkerImpl_JNI.c
@@ -8,8 +8,8 @@
#include <windows.h>
/* This typedef is apparently needed for compilers before VC8,
and for the embedded ARM compilers we're using */
- #if (_MSC_VER < 1400) || defined(UNDER_CE)
- typedef int intptr_t;
+ #if !defined(__MINGW64__) && ( (_MSC_VER < 1400) || defined(UNDER_CE) )
+ typedef int intptr_t;
#endif
/* GetProcAddress doesn't exist in A/W variants under desktop Windows */
#ifndef UNDER_CE