Title: [184465] releases/WebKitGTK/webkit-2.4/Source/_javascript_Core
- Revision
- 184465
- Author
- [email protected]
- Date
- 2015-05-18 05:23:14 -0700 (Mon, 18 May 2015)
Log Message
webkit-gtk 2.3.3 fails to build on OS X - Conflicting type "Fixed"
https://bugs.webkit.org/show_bug.cgi?id=126433
Don't include CoreFoundation.h when building the GTK port.
Patch by Philip Chimento <[email protected]> on 2015-01-06
* Source/_javascript_Core/API/WebKitAvailability.h: Add
!defined(BUILDING_GTK__) to defined(__APPLE__).
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/API/WebKitAvailability.h (184464 => 184465)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/API/WebKitAvailability.h 2015-05-18 12:07:29 UTC (rev 184464)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/API/WebKitAvailability.h 2015-05-18 12:23:14 UTC (rev 184465)
@@ -26,7 +26,7 @@
#ifndef __WebKitAvailability__
#define __WebKitAvailability__
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(BUILDING_GTK__)
#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
#else
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog (184464 => 184465)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2015-05-18 12:07:29 UTC (rev 184464)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2015-05-18 12:23:14 UTC (rev 184465)
@@ -1,3 +1,13 @@
+2015-01-06 Philip Chimento <[email protected]>
+
+ webkit-gtk 2.3.3 fails to build on OS X - Conflicting type "Fixed"
+ https://bugs.webkit.org/show_bug.cgi?id=126433
+
+ Don't include CoreFoundation.h when building the GTK port.
+
+ * Source/_javascript_Core/API/WebKitAvailability.h: Add
+ !defined(BUILDING_GTK__) to defined(__APPLE__).
+
2015-03-09 Mark Lam <[email protected]>
8-bit version of weakCompareAndSwap() can cause an infinite loop.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
