[Xquartz-changes] xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/pbproxy/x-selection.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 69a9171dbbafd6a7db702d48770d28fb54717545
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Mar 1 20:02:46 2011 -0800

    XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 Cursor types
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/pbproxy/x-selection.h b/hw/xquartz/pbproxy/x-selection.h
index 614c8b0..d4a39e5 100644
--- a/hw/xquartz/pbproxy/x-selection.h
+++ b/hw/xquartz/pbproxy/x-selection.h
@@ -33,7 +33,9 @@
 
 #include "pbproxy.h"
 
+#define  Cursor X_Cursor
 #include <X11/extensions/Xfixes.h>
+#undef Cursor
 
 #include <AppKit/NSPasteboard.h>