Fixed the Apple SDL_opengl.h conflict in the 1.2 branch.

--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon 2011-08-26 03:39:54 -04:00
parent 140a554418
commit 44262cd9eb

View file

@ -3108,9 +3108,14 @@ typedef char GLchar; /* native character */
#ifndef GL_VERSION_1_5 #ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */
#ifdef __APPLE__
typedef long GLintptr;
typedef long GLsizeiptr;
#else
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
#endif #endif
#endif
#ifndef GL_ARB_vertex_buffer_object #ifndef GL_ARB_vertex_buffer_object
/* GL types for handling large vertex buffer objects */ /* GL types for handling large vertex buffer objects */