Changeset 195184 in webkit

Timestamp:

Jan 17, 2016 2:24:59 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Ensure that CF_AVAILABLE is undefined when building webkit-gtk

​https://bugs.webkit.org/show_bug.cgi?id=152720

This change ensures that CF_AVAILABLE is correctly a no-op to
address build failure that was observed when building on older
versions of OSX. Previously, CF_AVAILABLE may have been unexpectedly
re-defined to the system header value based on include-order.

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-01-17
Reviewed by Michael Catanzaro.

• API/WebKitAvailability.h:

Location:

trunk/Source/JavaScriptCore

Files:

• API/WebKitAvailability.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/WebKitAvailability.h

@@ -27 +27 @@
 #define __WebKitAvailability__
 
-#if defined(__APPLE__) && !defined(BUILDING_GTK__)
+#if defined(__APPLE__)
 
 #include <AvailabilityMacros.h>
@@ -65 +65 @@
 #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
 
+#if defined(BUILDING_GTK__)
+#undef CF_AVAILABLE
+#define CF_AVAILABLE(_mac, _ios)
+#endif
+
 #else
 #define CF_AVAILABLE(_mac, _ios)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-17  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        Ensure that CF_AVAILABLE is undefined when building webkit-gtk
+
+        https://bugs.webkit.org/show_bug.cgi?id=152720
+
+        This change ensures that CF_AVAILABLE is correctly a no-op to
+        address build failure that was observed when building on older
+        versions of OSX.  Previously, CF_AVAILABLE may have been unexpectedly
+        re-defined to the system header value based on include-order.
+
+        Reviewed by Michael Catanzaro.
+
+        * API/WebKitAvailability.h:
+
 2016-01-17  Julien Brianceau  <jbriance@cisco.com>