summaryrefslogtreecommitdiffstats
path: root/src/glx/apple/apple_visual.c
diff options
context:
space:
mode:
authorJeremy Huddleston <[email protected]>2010-04-12 18:37:47 -0700
committerJeremy Huddleston <[email protected]>2010-04-27 12:37:16 -0700
commita1cb3babbef2af222b839a058694acc82a7074f1 (patch)
treeaabd71a9c7b24c61816f759fd835dc2e1f4170ba /src/glx/apple/apple_visual.c
parentf64773010d0dd204177d08716565db69f6263e0f (diff)
Buildfixes to work around issues in OpenGL.framework
Signed-off-by: Jeremy Huddleston <[email protected]>
Diffstat (limited to 'src/glx/apple/apple_visual.c')
-rw-r--r--src/glx/apple/apple_visual.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
index e80914741e6..da5aa05fd50 100644
--- a/src/glx/apple/apple_visual.c
+++ b/src/glx/apple/apple_visual.c
@@ -32,9 +32,18 @@
#include <stdlib.h>
#include <assert.h>
#include <GL/gl.h>
+
+/* <rdar://problem/6953344> */
+#define glTexImage1D glTexImage1D_OSX
+#define glTexImage2D glTexImage2D_OSX
+#define glTexImage3D glTexImage3D_OSX
#include <OpenGL/OpenGL.h>
#include <OpenGL/CGLContext.h>
#include <OpenGL/CGLRenderers.h>
+#undef glTexImage1D
+#undef glTexImage2D
+#undef glTexImage3D
+
#include "apple_cgl.h"
#include "apple_visual.h"
#include "apple_glx.h"