summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2016-09-30 07:23:59 +0200
committerTingPing <tingping@tingping.se>2016-09-30 01:23:59 -0400
commit65abf5c5324536b14985689bb97af61bf439d651 (patch)
tree6362b65854be53f60ee8e4b307210f08d14835f2
parentc79ce843f495b913ddafa383e6cf818ac99b4f15 (diff)
sysinfo: fixup 49758cafba9fd7e0663b550debfd51fb21260650. (#1827)
MAC_OS_X_VERSION_MAX_ALLOWED reflects the currently running OS X version
more closely than MAC_OS_X_VERSION_MIN_REQUIRED, given it's defined as
max(current_version, MAC_OS_X_VERSION_MIN_REQUIRED).

Additionally, we should check if MAC_OS_X_VERSION_10_9 is actually
defined, otherwise the whole macro logic breaks apart.
-rw-r--r--plugins/sysinfo/osx/backend.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/sysinfo/osx/backend.m b/plugins/sysinfo/osx/backend.m
index 806e2d74..73bdf996 100644
--- a/plugins/sysinfo/osx/backend.m
+++ b/plugins/sysinfo/osx/backend.m
@@ -78,7 +78,7 @@ get_os (void)
 static char *
 get_os_fallback (void)
 {
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_9
+#if !defined (MAC_OS_X_VERSION_10_9) || MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_9
 	SInt32 ver_major = 0,
 	       ver_minor = 0,
 	       ver_patch = 0;