[Xquartz-changes] [314] AppleSGLX/trunk/include/GL/gl.h.footer

[source_changes at macosforge.org]

Revision: 314
          http://trac.macosforge.org/projects/xquartz/changeset/314
Author:   jeremyhu at freedesktop.org
Date:     2009-03-18 00:30:54 -0700 (Wed, 18 Mar 2009)
Log Message:
-----------
Updated gl.h to work with the changes I suggested in <rdar://problem/6687440> gl.h: Provide an option to define both prototypes and function pointers

Modified Paths:
--------------
    AppleSGLX/trunk/include/GL/gl.h.footer

Modified: AppleSGLX/trunk/include/GL/gl.h.footer
===================================================================
--- AppleSGLX/trunk/include/GL/gl.h.footer	2009-03-17 06:41:06 UTC (rev 313)
+++ AppleSGLX/trunk/include/GL/gl.h.footer	2009-03-18 07:30:54 UTC (rev 314)
@@ -1,12 +1,29 @@
+/* We want to use OpelGL.framework's headers to get both prototypes and
+ * function pointers (like Mesa's API)
+ */
 
-#ifdef GL_GLEXT_LEGACY 
-/* The user has requested the exclusion of glext.h. */
+#ifndef GL_GLEXT_FUNCTION_POINTERS
+#define GL_GLEXT_FUNCTION_POINTERS 1
+#endif
+
+#ifndef GL_GLEXT_PROTOTYPES
+#define GL_GLEXT_PROTOTYPES 0
+#endif
+
+/* Our glext.h is based on a version from the registry that is newer. */
+#ifndef GL_GLEXT_LEGACY
+#define GL_GLEXT_LEGACY 0
+#endif
+
 #include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h"
-#else
-#define GL_GLEXT_LEGACY 1
-#include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h"
+
+/* Unset GL_GLEXT_PROTOTYPES for glext.h if the user didn't want those */
+#if GL_GLEXT_PROTOTYPES == 0
+#undef GL_GLEXT_PROTOTYPES
+#endif
+
+#if GL_GLEXT_LEGACY == 0
 #undef GL_GLEXT_LEGACY
-/* Our glext.h is based on a version from the registry that is newer. */
 #include <GL/glext.h>
 #endif
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20090318/7e185089/attachment.html>