Fix build on Mac OS X 10.7.

Issue #45.

diff --git a/glimports.hpp b/glimports.hpp
index a24e20f139db217824e891542a88202a01240e0a..caa3a4e9c20ac2c6d1362b219ac0de8d39c4497e 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -34,6 +34,15 @@
 // Prevent including system's glext.h
 #define __glext_h_
 
+// Some functions take GLenum disguised as GLint.  Apple noticed and fixed it
+// in the Mac OS X 10.6.x gl.h headers.  Regardless, C++ typechecking rules
+// force the wrappers to match the prototype precisely.
+#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_7)
+#define GLenum_int GLenum
+#else
+#define GLenum_int GLint
+#endif
+
 
 #if defined(_WIN32)
 

diff --git a/specs/gltypes.py b/specs/gltypes.py
index e25cd7e686b3352732594bd45fe65b2a2d4c49e8..e187688a73ae5c6dfad41a25e55b3b4fe95e4a5e 100644 (file)
--- a/specs/gltypes.py
+++ b/specs/gltypes.py
@@ -91,13 +91,12 @@ GLenum = Enum("GLenum", [
     # Parameters are added later from glparams.py's parameter table
 ])
 
-# Some functions take GLenum disguised as GLint.  Apple noticed and fixed it in
-# the gl.h header.  Regardless, C++ typechecking rules force the wrappers to
-# match the prototype precisely.
-if platform.system() == 'Darwin':
-    GLenum_int = GLenum
-else:
-    GLenum_int = Alias("GLint", GLenum)
+# Some functions take GLenum disguised as GLint, and need special treatment so
+# that symbolic names are traced correctly.  Apple noticed and fixed it in the
+# gl.h header, which further complicates things.  C++ typechecking rules force
+# the wrappers to match the prototype precisely, so the precise type is defined
+# in glimports.hpp
+GLenum_int = Alias("GLenum_int", GLenum)
 
 GLenum_mode = FakeEnum(GLenum, [
     "GL_POINTS",                         # 0x0000