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 56480d28cf898765
parent 5645 80e036f88a6e
child 5649 02ab15cfa992
Fixed the Apple SDL_opengl.h conflict in the 1.2 branch.
include/SDL_opengl.h
     1.1 --- a/include/SDL_opengl.h	Thu Aug 25 03:04:24 2011 -0400
     1.2 +++ b/include/SDL_opengl.h	Fri Aug 26 03:39:54 2011 -0400
     1.3 @@ -3108,9 +3108,14 @@
     1.4  
     1.5  #ifndef GL_VERSION_1_5
     1.6  /* GL types for handling large vertex buffer objects */
     1.7 +#ifdef __APPLE__
     1.8 +typedef long GLintptr;
     1.9 +typedef long GLsizeiptr;
    1.10 +#else
    1.11  typedef ptrdiff_t GLintptr;
    1.12  typedef ptrdiff_t GLsizeiptr;
    1.13  #endif
    1.14 +#endif
    1.15  
    1.16  #ifndef GL_ARB_vertex_buffer_object
    1.17  /* GL types for handling large vertex buffer objects */