summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-05-07 16:16:20 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2012-05-29 13:17:02 -0700
commit21956e2f8e506dd167f188be0d3b18e052c6913d (patch)
tree9f4faf778d825f6efd30db8e20f6a007df650af1
parent131fe8fbd17edb05084cd7cddc3c4d3d3b393d73 (diff)
XQuartz: Workaround an SDK bug on Leopard/x86_64
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 4acbaa3027d89728ed932616f6ef66d93537b101)
-rw-r--r--hw/xquartz/quartz.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index ebaa56785..62a2852b7 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -69,6 +69,12 @@
#include <rootlessCommon.h>
#include <Xplugin.h>
+/* Work around a bug on Leopard's headers */
+#if defined (__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 && MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+extern OSErr UpdateSystemActivity(UInt8 activity);
+#define OverallAct 0
+#endif
+
DevPrivateKeyRec quartzScreenKeyRec;
int aquaMenuBarHeight = 0;
QuartzModeProcsPtr quartzProcs = NULL;