From a11a1ca14df9249a00eae88a66ff9faa184dbc11 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 26 Aug 2011 03:39:54 -0400
Subject: [PATCH] Fixed the Apple SDL_opengl.h conflict in the 1.2 branch.

---
 include/SDL_opengl.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h
index 09c8736d6..ec75a63b1 100644
--- a/include/SDL_opengl.h
+++ b/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 */