diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-07-17 16:32:05 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-07-17 16:32:05 +0800 |
| commit | 36dea383df1d08a22b07a9c1348c9824d2099a85 (patch) | |
| tree | e29444b67217c606051b4f56ae2dd3b695cc95fe /ndk/sources/android | |
| parent | 37feee2abc4f975962fbfab4052834800669964e (diff) | |
| download | android_development-36dea383df1d08a22b07a9c1348c9824d2099a85.tar.gz android_development-36dea383df1d08a22b07a9c1348c9824d2099a85.tar.bz2 android_development-36dea383df1d08a22b07a9c1348c9824d2099a85.zip | |
Fix gl3stub.h
Only define the following before android-L (where new headers define
them already)
typedef khronos_int64_t GLint64;
typedef khronos_uint64_t GLuint64;
typedef struct __GLsync *GLsync;
Also define L to 9999 for crtbrand.c which needs it to be an integer
Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
Diffstat (limited to 'ndk/sources/android')
| -rw-r--r-- | ndk/sources/android/ndk_helper/gl3stub.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ndk/sources/android/ndk_helper/gl3stub.h b/ndk/sources/android/ndk_helper/gl3stub.h index 537dd28b5..c8960dfd6 100644 --- a/ndk/sources/android/ndk_helper/gl3stub.h +++ b/ndk/sources/android/ndk_helper/gl3stub.h @@ -14,6 +14,7 @@ */ #include <GLES2/gl2.h> +#include <android/api-level.h> #ifdef __cplusplus extern "C" @@ -64,9 +65,11 @@ GLboolean gl3stubInit(); /* OpenGL ES 3.0 */ typedef unsigned short GLhalf; +#if __ANDROID_API__ <= 19 typedef khronos_int64_t GLint64; typedef khronos_uint64_t GLuint64; typedef struct __GLsync *GLsync; +#endif /*------------------------------------------------------------------------- * Token definitions |