diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-12 18:37:47 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-27 12:37:16 -0700 |
| commit | a1cb3babbef2af222b839a058694acc82a7074f1 (patch) | |
| tree | aabd71a9c7b24c61816f759fd835dc2e1f4170ba /src/glx/apple/apple_glx_context.h | |
| parent | f64773010d0dd204177d08716565db69f6263e0f (diff) | |
Buildfixes to work around issues in OpenGL.framework
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'src/glx/apple/apple_glx_context.h')
| -rw-r--r-- | src/glx/apple/apple_glx_context.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/glx/apple/apple_glx_context.h b/src/glx/apple/apple_glx_context.h index 7e2394f2bb..c2a3e3fcf6 100644 --- 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 |