diff options
| author | Kenneth Russel <[email protected]> | 2008-07-31 03:08:44 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-07-31 03:08:44 +0000 |
| commit | 07a44e1d67b4f0ea2efb68c888cd8c6e1f7d2632 (patch) | |
| tree | 26d15613f76f7c4f63ae3fd589045a52eb03eccf /src/native/jogl/InternalBufferUtils.c | |
| parent | fda288da7746aefc3c9380aa63e02ad6da42ba5b (diff) | |
Fixed loading of GLES and EGL libraries, and error reporting when none
available. Fixed building with -Djogl.cdcfp, in particular nested
building of gluegen. Took out call to SHFullScreen, which doesn't seem
to be available on the NVidia APX 2500 any more. Fixed #includes in
InternalBufferUtils.c.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1738 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/native/jogl/InternalBufferUtils.c')
| -rw-r--r-- | src/native/jogl/InternalBufferUtils.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/native/jogl/InternalBufferUtils.c b/src/native/jogl/InternalBufferUtils.c index cfda63ede..4b2001a34 100644 --- a/src/native/jogl/InternalBufferUtils.c +++ b/src/native/jogl/InternalBufferUtils.c @@ -39,10 +39,19 @@ #include <jni.h> -#ifdef _MSC_VER - /* This typedef is apparently needed for compilers before VC8 */ - #if _MSC_VER < 1400 - typedef int intptr_t; +#ifdef _WIN32 + #ifdef _MSC_VER + /* This typedef is apparently needed for Microsoft compilers before VC8, + and on Windows CE */ + #if (_MSC_VER < 1400) || defined(UNDER_CE) + #ifdef _WIN64 + typedef long long intptr_t; + #else + typedef int intptr_t; + #endif + #endif + #else + #include <inttypes.h> #endif #else #include <inttypes.h> |