eina,ecore_cocoa: fix detection of the macOS SDK version

There was trouble with Homebrew's CI to build EFL on a macOS < 10.12
which uses a 10.12 SDK. See PR #13252 on github, Homebrew/homebrew-core
for details.

@fix

diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h
index a97d278..d2c67ac 100644 (file)
--- a/src/lib/ecore_cocoa/ecore_cocoa_private.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h
@@ -30,9 +30,10 @@ extern int _ecore_cocoa_log_domain;
 
 /*
  * macOS Sierra (10.12) deprecated enumeration types in profit to others,
- * more meaningful ones.
+ * more meaningful ones. We define aliases to these new types to use the
+ * most recent API while being retro-compatible.
  */
-#ifndef __MAC_10_12
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1012 /* Before 10.12 */
 # define NSWindowStyleMaskTitled NSTitledWindowMask
 # define NSWindowStyleMaskClosable NSClosableWindowMask
 # define NSWindowStyleMaskResizable NSResizableWindowMask

diff --git a/src/lib/eina/eina_lock.c b/src/lib/eina/eina_lock.c
index 5cb834e..e8872a6 100644 (file)
--- a/src/lib/eina/eina_lock.c
+++ b/src/lib/eina/eina_lock.c
@@ -17,7 +17,7 @@
  * stdbool.h, which is not wanted: it would introduce new macros,
  * and break compilation of existing programs.
  */
-# ifdef __MAC_10_12
+# if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1012
 #  include <os/lock.h>
 #  define SPINLOCK_GET(LCK) ((os_unfair_lock_t)(LCK))
 # else