diff options
| author | Michael Bien <[email protected]> | 2010-03-30 14:01:15 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-03-30 14:01:15 +0200 |
| commit | 44b93b2d63539bca4c7e3facfee90d5f3bbb67cf (patch) | |
| tree | 528cb1b0c5e965cc07cfd390196caf05aba9aa7f /make | |
| parent | f250183bc3d8eb4ef87cecb3311eae554dcafe53 (diff) | |
| parent | 62dcd1a3fe345c4d2c0e42472d2c7646fe224e8f (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'make')
| -rwxr-xr-x | make/stub_includes/egl/EGL/egl.h | 8 | ||||
| -rw-r--r-- | make/stub_includes/opengl/gl3-64bit-types.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/make/stub_includes/egl/EGL/egl.h b/make/stub_includes/egl/EGL/egl.h index fc6cc4c87..a384bab48 100755 --- a/make/stub_includes/egl/EGL/egl.h +++ b/make/stub_includes/egl/EGL/egl.h @@ -20,13 +20,7 @@ extern "C" { typedef int32_t EGLint; typedef unsigned int EGLBoolean; typedef unsigned int EGLenum; -#ifdef USE_GLUEGEN - /* GlueGen currently needs this form of typedef to produce distinct - types for each of these pointer types */ - typedef struct {} _EGLConfig, *EGLConfig; -#else - typedef void *EGLConfig; -#endif +typedef void *EGLConfig; typedef void *EGLContext; typedef void *EGLDisplay; typedef void *EGLSurface; diff --git a/make/stub_includes/opengl/gl3-64bit-types.h b/make/stub_includes/opengl/gl3-64bit-types.h index fc8b4ce05..64f12398a 100644 --- a/make/stub_includes/opengl/gl3-64bit-types.h +++ b/make/stub_includes/opengl/gl3-64bit-types.h @@ -25,12 +25,14 @@ #include <stdint.h> #elif defined(__UNIXOS2__) || defined(__SOL64__) typedef long int int32_t; + typedef unsigned long int uint32_t; typedef long long int int64_t; typedef unsigned long long int uint64_t; #elif defined(WIN32) && defined(__GNUC__) #include <stdint.h> #elif defined(_WIN32) typedef __int32 int32_t; + typedef unsigned __int32 uint32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; #else |