]> jfr.im git - irc/hexchat/hexchat.git/commitdiff
sysinfo: fix compilation on OS X 10.9 and lower. (#1821)
authorMihai Moldovan <redacted>
Mon, 26 Sep 2016 06:49:56 +0000 (08:49 +0200)
committerTingPing <redacted>
Mon, 26 Sep 2016 06:49:56 +0000 (23:49 -0700)
Use the (deprecated) Gestalt functionality for fetching the fine-grained
OS X version number on 10.9 and lower.

The newer NSOperatingSystemVersion structure is only available on
10.10+.

plugins/sysinfo/osx/backend.m

index 450a557a2a85a3a2995b0b3ac863beacea61a3c6..806e2d74db85ba0b40b89b37de9984752cd5afb3 100644 (file)
@@ -78,10 +78,22 @@ get_os (void)
 static char *
 get_os_fallback (void)
 {
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_9
+       SInt32 ver_major = 0,
+              ver_minor = 0,
+              ver_patch = 0;
+
+       Gestalt (gestaltSystemVersionMajor, &ver_major);
+       Gestalt (gestaltSystemVersionMinor, &ver_minor);
+       Gestalt (gestaltSystemVersionBugFix, &ver_patch);
+
+       return g_strdup_printf ("OS X %d.%d.%d", ver_major, ver_minor, ver_patch);
+#else
        NSProcessInfo *info = [NSProcessInfo processInfo];
        NSOperatingSystemVersion version = [info operatingSystemVersion];
 
        return g_strdup_printf ("OS X %ld.%ld.%ld", version.majorVersion, version.minorVersion, version.patchVersion);
+#endif
 }
 char *
 sysinfo_backend_get_os(void)