summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-01-27 13:35:17 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-02-01 16:21:39 -0800
commitaea15a76593f98205e44f20632178dc384c02d57 (patch)
tree8a3ca3573050d5c5a6da29a43a8048c7e6ac547a
parentc0b2d3e099a60f55b18ca9c30373000f12d40fe2 (diff)
xquartz: Remove support for Mountain Lion and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/mach-startup/bundle-main.c2
-rw-r--r--hw/xquartz/xpr/xprScreen.c24
2 files changed, 9 insertions, 17 deletions
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index b7d5ebef7..cacac7a8f 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -57,6 +57,8 @@
#include "mach_startup.h"
#include "mach_startupServer.h"
+#include <asl.h>
+
/* From darwinEvents.c ... but don't want to pull in all the server cruft */
void
DarwinListenOnOpenFD(int fd);
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index f54870dd9..ec2cdaa0c 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -56,11 +56,6 @@
#include "nonsdk_extinit.h"
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-// From NSApplication.h
-extern const double NSAppKitVersionNumber;
-#endif
-
/* 10.4's deferred update makes X slower.. have to live with the tearing
* for now.. */
#define XP_NO_DEFERRED_UPDATES 8
@@ -172,18 +167,13 @@ displayScreenBounds(CGDirectDisplayID id)
(int)frame.origin.x, (int)frame.origin.y);
Boolean spacePerDisplay = false;
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
- if (NSAppKitVersionNumber >= 1265)
-#endif
- {
- Boolean ok;
- (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
- spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
- CFSTR("com.apple.spaces"),
- &ok);
- if (!ok)
- spacePerDisplay = true;
- }
+ Boolean ok;
+ (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
+ spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
+ CFSTR("com.apple.spaces"),
+ &ok);
+ if (!ok)
+ spacePerDisplay = true;
/* Remove menubar to help standard X11 window managers.
* On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.