Skip to content
Permalink
Browse files

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

  • Loading branch information
icculus committed Aug 26, 2011
1 parent ccde1ce commit a11a1ca14df9249a00eae88a66ff9faa184dbc11
Showing with 5 additions and 0 deletions.
  1. +5 −0 include/SDL_opengl.h
@@ -3108,9 +3108,14 @@ typedef char GLchar; /* native character */

#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 */

0 comments on commit a11a1ca

Please sign in to comment.