Title: [190982] releases/WebKitGTK/webkit-2.10/Source/_javascript_Core
- Revision
- 190982
- Author
- [email protected]
- Date
- 2015-10-13 06:05:37 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190862 - webkit-gtk 2.3.3 fails to build on OS X - Conflicting type "Fixed"
https://bugs.webkit.org/show_bug.cgi?id=126433
Patch by Philip Chimento <[email protected]> on 2015-10-12
Reviewed by Philippe Normand
Don't include CoreFoundation.h when building the GTK port.
* Source/_javascript_Core/API/WebKitAvailability.h: Add !defined(BUILDING_GTK__) to defined(__APPLE__).
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/WebKitAvailability.h (190981 => 190982)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/WebKitAvailability.h 2015-10-13 13:03:15 UTC (rev 190981)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/API/WebKitAvailability.h 2015-10-13 13:05:37 UTC (rev 190982)
@@ -26,7 +26,7 @@
#ifndef __WebKitAvailability__
#define __WebKitAvailability__
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(BUILDING_GTK__)
#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
Modified: releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog (190981 => 190982)
--- releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-10-13 13:03:15 UTC (rev 190981)
+++ releases/WebKitGTK/webkit-2.10/Source/_javascript_Core/ChangeLog 2015-10-13 13:05:37 UTC (rev 190982)
@@ -1,5 +1,16 @@
2015-10-12 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
+
+ Reviewed by Philippe Normand
+
+ Don't include CoreFoundation.h when building the GTK port.
+
+ * Source/_javascript_Core/API/WebKitAvailability.h: Add !defined(BUILDING_GTK__) to defined(__APPLE__).
+
+2015-10-12 Philip Chimento <[email protected]>
+
webkit-gtk-2.3.4 fails to link _javascript_Core, missing symbols add_history and readline
https://bugs.webkit.org/show_bug.cgi?id=127059
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
