Title: [195184] trunk/Source/_javascript_Core
- Revision
- 195184
- Author
- [email protected]
- Date
- 2016-01-17 14:24:59 -0800 (Sun, 17 Jan 2016)
Log 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 <[email protected]> on 2016-01-17
Reviewed by Michael Catanzaro.
* API/WebKitAvailability.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/WebKitAvailability.h (195183 => 195184)
--- trunk/Source/_javascript_Core/API/WebKitAvailability.h 2016-01-17 18:09:19 UTC (rev 195183)
+++ trunk/Source/_javascript_Core/API/WebKitAvailability.h 2016-01-17 22:24:59 UTC (rev 195184)
@@ -26,7 +26,7 @@
#ifndef __WebKitAvailability__
#define __WebKitAvailability__
-#if defined(__APPLE__) && !defined(BUILDING_GTK__)
+#if defined(__APPLE__)
#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
@@ -64,6 +64,11 @@
#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)
#endif
Modified: trunk/Source/_javascript_Core/ChangeLog (195183 => 195184)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-17 18:09:19 UTC (rev 195183)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-17 22:24:59 UTC (rev 195184)
@@ -1,3 +1,18 @@
+2016-01-17 Jeremy Huddleston Sequoia <[email protected]>
+
+ 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 <[email protected]>
[mips] Fix regT2 and regT3 trampling in MacroAssembler
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
