Title: [104826] trunk/Source/_javascript_Core
- Revision
- 104826
- Author
- zeno.albis...@nokia.com
- Date
- 2012-01-12 07:28:46 -0800 (Thu, 12 Jan 2012)
Log Message
[Qt][WK2][Mac] Conflict of MacTypes.h defining a Fixed type after r104560.
https://bugs.webkit.org/show_bug.cgi?id=76175
Defining ENABLE_CSS_FILTERS leads to ambiguous references
due to MacTypes.h being included.
Defining CF_OPEN_SOURCE works around this problem.
Reviewed by Simon Hausmann.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (104825 => 104826)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-12 15:14:56 UTC (rev 104825)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-12 15:28:46 UTC (rev 104826)
@@ -1,3 +1,16 @@
+2012-01-12 Zeno Albisser <z...@webkit.org>
+
+ [Qt][WK2][Mac] Conflict of MacTypes.h defining a Fixed type after r104560.
+ https://bugs.webkit.org/show_bug.cgi?id=76175
+
+ Defining ENABLE_CSS_FILTERS leads to ambiguous references
+ due to MacTypes.h being included.
+ Defining CF_OPEN_SOURCE works around this problem.
+
+ Reviewed by Simon Hausmann.
+
+ * wtf/Platform.h:
+
2012-01-12 Simon Hausmann <simon.hausm...@nokia.com>
Make the new WTF module build on Qt
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (104825 => 104826)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-01-12 15:14:56 UTC (rev 104825)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-01-12 15:28:46 UTC (rev 104826)
@@ -561,6 +561,8 @@
#if PLATFORM(QT) && OS(DARWIN)
#define WTF_USE_CF 1
#define HAVE_DISPATCH_H 1
+/* FIXME: This is a hack to work around a conflict of MacTypes.h defining a Fixed type. */
+#define CF_OPEN_SOURCE 1
#endif
#if OS(DARWIN) && !PLATFORM(GTK) && !PLATFORM(QT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
