commit cc46a31572a0ec5eaa1b23568b13d1176f22f6cb
author wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Oct 16 17:12:05 2019 +0000
committer wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Oct 16 17:12:05 2019 +0000
tree 9417a01f58f9f25e3e2adbc529239cf3512df5a0
parent 60e48a657ec4b094f5b13ac7ee60dc2e55d58096

Unreviewed, fix the internal macOS 10.13 and 10.14 builds after r251171

Source/WebKit:

* Platform/spi/mac/ApplicationServicesSPI.h: Guard SPI declarations that use AXClientType with HAVE(AX_CLIENT_TYPE).

Source/WTF:

* wtf/Platform.h: Add a HAVE() macro for AXClientType, which is only available on macOS 10.15+ SDKs.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 004754c..7555d4e 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the internal macOS 10.13 and 10.14 builds after r251171
+
+        * wtf/Platform.h: Add a HAVE() macro for AXClientType, which is only available on macOS 10.15+ SDKs.
+
 2019-10-15  Chris Dumez  <cdumez@apple.com>
 
         [macOS] Simplify main thread initialization

Source/WTF/wtf/Platform.h

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 0a4634f..ce1785d 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1631,6 +1631,10 @@
 #define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+#define HAVE_AX_CLIENT_TYPE 1
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
 #define HAVE_DESIGN_SYSTEM_UI_FONTS 1
 #endif

Source/WebKit/ChangeLog

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 9afb8ee..8355b86 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-16  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the internal macOS 10.13 and 10.14 builds after r251171
+
+        * Platform/spi/mac/ApplicationServicesSPI.h: Guard SPI declarations that use AXClientType with HAVE(AX_CLIENT_TYPE).
+
 2019-10-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK][WPE] Add user messages API

Source/WebKit/Platform/spi/mac/ApplicationServicesSPI.h

diff --git a/Source/WebKit/Platform/spi/mac/ApplicationServicesSPI.h b/Source/WebKit/Platform/spi/mac/ApplicationServicesSPI.h
index a31f2da..048bdcb 100644
--- a/Source/WebKit/Platform/spi/mac/ApplicationServicesSPI.h
+++ b/Source/WebKit/Platform/spi/mac/ApplicationServicesSPI.h
@@ -33,6 +33,8 @@
 
 #else
 
+#if HAVE(AX_CLIENT_TYPE)
+
 typedef CF_ENUM(int32_t, AXClientType)
 {
     kAXClientTypeNoActiveRequestFound  = 0,
@@ -48,6 +50,8 @@
     kAXClientTypeDictation,
 };
 
+#endif // HAVE(AX_CLIENT_TYPE)
+
 typedef enum {
     AXSuspendStatusRunning = 0,
     AXSuspendStatusSuspended,
@@ -55,6 +59,8 @@
 
 #endif
 
+#if HAVE(AX_CLIENT_TYPE)
 extern AXClientType _AXGetClientForCurrentRequestUntrusted(void);
+#endif // HAVE(AX_CLIENT_TYPE)
 
 #endif // PLATFORM(MAC)