diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-03-01 20:02:46 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-03-01 20:02:46 -0800 |
| commit | 69a9171dbbafd6a7db702d48770d28fb54717545 (patch) | |
| tree | 34c48bb9dfd4a7dc293fd69d56ff2b358f3a7621 | |
| parent | 0343aed1f082baf4bfbd730c1c3582f1410b8741 (diff) | |
XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 Cursor types
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | hw/xquartz/pbproxy/x-selection.h | 2 |
1 files changed, 2 insertions, 0 deletions
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> |