From 98e6adcfca737c542937adfa0d9dd74be473bb55 Mon Sep 17 00:00:00 2001 From: Stuart Carnie Date: Mon, 5 Nov 2018 06:52:31 -0700 Subject: [PATCH] chore(cocoa): Remove Gestalt compiler warnings for macOS 10.13+ --- frontend/drivers/platform_darwin.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 2e367ec0f7..d7b654349a 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -292,6 +292,12 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor) get_ios_version(major, minor); strlcpy(s, "iOS", len); #elif defined(OSX) + +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 // MAC_OS_X_VERSION_10_13 + NSOperatingSystemVersion version = NSProcessInfo.processInfo.operatingSystemVersion; + *major = (int)version.majorVersion; + *minor = (int)version.minorVersion; +#else if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) { typedef struct @@ -309,6 +315,7 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor) Gestalt(gestaltSystemVersionMinor, (SInt32*)minor); Gestalt(gestaltSystemVersionMajor, (SInt32*)major); } +#endif strlcpy(s, "OSX", len); #endif }