From 69a9171dbbafd6a7db702d48770d28fb54717545 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue, 1 Mar 2011 20:02:46 -0800
Subject: [PATCH] XQuartz: pbproxy: Protect against possible collision between
 Cocoa and X11 Cursor types

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 hw/xquartz/pbproxy/x-selection.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xquartz/pbproxy/x-selection.h b/hw/xquartz/pbproxy/x-selection.h
index 614c8b091..d4a39e58f 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>