Revision: 342 http://trac.macosforge.org/projects/xquartz/changeset/342 Author: jeremyhu@freedesktop.org Date: 2009-05-29 14:35:04 -0700 (Fri, 29 May 2009) Log Message: ----------- Avoid warnings about redefined macros in gl.h Modified Paths: -------------- AppleSGLX/trunk/include/GL/gl.h.template Modified: AppleSGLX/trunk/include/GL/gl.h.template =================================================================== --- AppleSGLX/trunk/include/GL/gl.h.template 2009-05-17 23:18:46 UTC (rev 341) +++ AppleSGLX/trunk/include/GL/gl.h.template 2009-05-29 21:35:04 UTC (rev 342) @@ -54,22 +54,22 @@ #include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h" /* Restore our GLEXT-fu */ +#undef GL_GLEXT_FUNCTION_POINTERS #ifdef _GL_GLEXT_FUNCTION_POINTERS #define GL_GLEXT_FUNCTION_POINTERS _GL_GLEXT_FUNCTION_POINTERS -#else -#undef GL_GLEXT_FUNCTION_POINTERS +#undef _GL_GLEXT_FUNCTION_POINTERS #endif +#undef GL_GLEXT_PROTOTYPES #ifdef _GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES _GL_GLEXT_PROTOTYPES -#else -#undef GL_GLEXT_PROTOTYPES +#undef _GL_GLEXT_PROTOTYPES #endif +#undef GL_GLEXT_LEGACY #ifdef _GL_GLEXT_LEGACY #define GL_GLEXT_LEGACY _GL_GLEXT_LEGACY -#else -#undef GL_GLEXT_LEGACY +#undef _GL_GLEXT_LEGACY #endif @CGL_MESA_FUNCTION_POINTERS@