646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
855 B
Diff
21 lines
855 B
Diff
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
|
|
index 6f5b8b1..2c7763d 100644
|
|
--- a/src/Fl_cocoa.mm
|
|
+++ b/src/Fl_cocoa.mm
|
|
@@ -4074,15 +4074,6 @@ Window fl_xid(const Fl_Window* w)
|
|
static int calc_mac_os_version() {
|
|
int M, m, b = 0;
|
|
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
|
|
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
|
|
- if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) {
|
|
- NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
|
|
- M = version.majorVersion;
|
|
- m = version.minorVersion;
|
|
- b = version.patchVersion;
|
|
- }
|
|
- else
|
|
-#endif
|
|
{
|
|
NSDictionary * sv = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
|
|
const char *s = [[sv objectForKey:@"ProductVersion"] UTF8String];
|