glx: unify GLX_SGIX_pbuffer aliased declarations

[mesa.git] / src / glx / apple / apple_glx_context.h

diff --git a/src/glx/apple/apple_glx_context.h b/src/glx/apple/apple_glx_context.h
index 7e2394f2bb606ef460a9b598341d1546d61eac20..c2a3e3fcf6f74521bc289cd6d334ac9e21495e03 100644 (file)
--- a/src/glx/apple/apple_glx_context.h
+++ b/src/glx/apple/apple_glx_context.h
@@ -29,11 +29,19 @@
 #ifndef APPLE_GLX_CONTEXT_H
 #define APPLE_GLX_CONTEXT_H
 
+/* <rdar://problem/6953344> */
+#define glTexImage1D glTexImage1D_OSX
+#define glTexImage2D glTexImage2D_OSX
+#define glTexImage3D glTexImage3D_OSX
+#include <OpenGL/CGLTypes.h>
+#include <OpenGL/CGLContext.h>
+#undef glTexImage1D
+#undef glTexImage2D
+#undef glTexImage3D
+
 #include <stdbool.h>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
-#include <OpenGL/CGLTypes.h>
-#include <OpenGL/CGLContext.h>
 #define XP_NO_X_HEADERS
 #include <Xplugin.h>
 #undef XP_NO_X_HEADERS