From cb23aec500cb1f0a3e167f9b44838754903e1d2e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 3 Nov 2016 14:25:10 +0100 Subject: [PATCH] Try to prevent GLES 2 compile-time issues where GLuint64/GLint64 is already provided by a system header --- libretro-common/include/glsym/glsym_es2.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libretro-common/include/glsym/glsym_es2.h b/libretro-common/include/glsym/glsym_es2.h index 81b3035f54..8712636ab8 100644 --- a/libretro-common/include/glsym/glsym_es2.h +++ b/libretro-common/include/glsym/glsym_es2.h @@ -23,6 +23,7 @@ typedef void *GLeglImageOES; typedef GLint GLfixed; #endif +#if !defined(GL_ES_VERSION_2_0) #if (__STDC_VERSION__ <= 199901L) || (OSX && !MAC_OS_X_VERSION_10_7) typedef long long int GLint64; typedef unsigned long long int GLuint64; @@ -32,6 +33,8 @@ typedef struct __GLsync *GLsync; typedef int64_t GLint64; typedef uint64_t GLuint64; #endif +#endif + typedef void (GL_APIENTRYP RGLSYMGLBLENDBARRIERKHRPROC) (void); typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (GL_APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);