[Xquartz-changes] xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/GL/capabilities.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d53235af85d50774c68347720ce132daf9a5bc49
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Feb 13 23:06:07 2012 -0800

    XQuartz: Build fix for possible conflict of BOOL type
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index dd3f855..b718a41 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) {