Fixed Mac OS X build

libsdl-org · Jun 4, 2014 · 1188c17 · 1188c17
1 parent d829af7
commit 1188c17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h
@@ -50,11 +50,7 @@
 #define __glext_h_              /* Don't let gl.h include glext.h */
 #endif
 #if defined(__MACOSX__)
-#include <stddef.h>             /* Needed for ptrdiff_t */
-/* Hack to prevent duplicate definition of GLsizeiptrARB and GLintptrARB in <OpenGL/gltypes.h> */
-#define GL_ARB_vertex_buffer_object 1
 #include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
-#undef GL_ARB_vertex_buffer_object
 #define __X_GL_H
 #else
 #include <GL/gl.h>              /* Header File For The OpenGL Library */

diff --git a/include/SDL_opengl_glext.h b/include/SDL_opengl_glext.h
@@ -4135,8 +4135,13 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);
 
 #ifndef GL_ARB_vertex_buffer_object
 #define GL_ARB_vertex_buffer_object 1
+#ifdef __MACOSX__ /* The OS X headers haven't caught up with Khronos yet */
+typedef long GLsizeiptrARB;
+typedef long GLintptrARB;
+#else
 typedef ptrdiff_t GLsizeiptrARB;
 typedef ptrdiff_t GLintptrARB;
+#endif
 #define GL_BUFFER_SIZE_ARB                0x8764
 #define GL_BUFFER_USAGE_ARB               0x8765
 #define GL_ARRAY_BUFFER_ARB               0x8892