Fixed the Apple SDL_opengl.h conflict in the 1.2 branch. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Fri, 26 Aug 2011 03:39:54 -0400
branchSDL-1.2
changeset 5648 0d28cf898765
parent 5645 80e036f88a6e
child 5649 02ab15cfa992
Fixed the Apple SDL_opengl.h conflict in the 1.2 branch.
include/SDL_opengl.h
--- a/include/SDL_opengl.h	Thu Aug 25 03:04:24 2011 -0400
+++ b/include/SDL_opengl.h	Fri Aug 26 03:39:54 2011 -0400
@@ -3108,9 +3108,14 @@
 
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptr;
+typedef long GLsizeiptr;
+#else
 typedef ptrdiff_t GLintptr;
 typedef ptrdiff_t GLsizeiptr;
 #endif
+#endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */