summaryrefslogtreecommitdiff
path: root/hw/xquartz
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-02-13 23:06:07 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-02-13 23:06:07 -0800
commitd53235af85d50774c68347720ce132daf9a5bc49 (patch)
tree95a8c8098ad5b3b74bf41eb823266346060804ff /hw/xquartz
parent62edd970f6f36058fcb31de4555eb7c1329cce74 (diff)
XQuartz: Build fix for possible conflict of BOOL type
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw/xquartz')
-rw-r--r--hw/xquartz/GL/capabilities.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index dd3f855f4..b718a4156 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -23,17 +23,20 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
+
+#define Cursor Mac_Cursor
+#define BOOL Mac_BOOL
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <OpenGL/glext.h>
#include <ApplicationServices/ApplicationServices.h>
+#undef Cursor
+#undef BOOL
#include "capabilities.h"
-#define Cursor X_Cursor
#include "os.h"
-#undef Cursor
static void handleBufferModes(struct glCapabilitiesConfig *c, GLint bufferModes) {
if(bufferModes & kCGLStereoscopicBit) {