summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-11-08 20:25:42 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-11-15 11:02:50 -0800
commit992cd86b9c189ae8cff57928037ac7399aa65871 (patch)
tree7c147fe14b9247b3ab0f390bdd7ba8a7b6a85dbf
parent7e5846504a0184299b4afb6c9e7328113e9b9d99 (diff)
XQuartz: Buildfix for Leopard and older
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> (cherry picked from commit 15fc56addcc906592af7c0f4c0a5ac906fa5c389)
-rw-r--r--hw/xquartz/X11Controller.h4
-rw-r--r--hw/xquartz/quartzKeyboard.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index bb284472a..9e16f75ce 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -55,7 +55,11 @@ typedef unsigned int NSUInteger;
#endif
#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
@interface X11Controller : NSObject <NSTableViewDataSource>
+#else
+@interface X11Controller : NSObject
+#endif
{
IBOutlet NSPanel *prefs_panel;
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 1b54014d0..29ec89d11 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -40,6 +40,7 @@
#define HACK_MISSING 1
#define HACK_KEYPAD 1
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>