Title: [128034] trunk/Tools
- Revision
- 128034
- Author
- [email protected]
- Date
- 2012-09-10 02:16:05 -0700 (Mon, 10 Sep 2012)
Log Message
Fix build of WTR with Qt on Windows
https://bugs.webkit.org/show_bug.cgi?id=96249
Patch by Simon Hausmann <[email protected]> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.
Windows loves to define min and max as macros, which beautifully
clashes in many places where min and max are used as variable or method
names. It can be convinced not to do this when min and max are already
define as macros (expanding to themselves). We have this kind of
workaround in config.h files all over WebKit and as it turns out when
building WTR with Qt on Windows we do end up with such a clash. Therefore
we need the same workaround.
* WebKitTestRunner/config.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128033 => 128034)
--- trunk/Tools/ChangeLog 2012-09-10 09:09:14 UTC (rev 128033)
+++ trunk/Tools/ChangeLog 2012-09-10 09:16:05 UTC (rev 128034)
@@ -1,3 +1,20 @@
+2012-09-10 Simon Hausmann <[email protected]>
+
+ Fix build of WTR with Qt on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=96249
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Windows loves to define min and max as macros, which beautifully
+ clashes in many places where min and max are used as variable or method
+ names. It can be convinced not to do this when min and max are already
+ define as macros (expanding to themselves). We have this kind of
+ workaround in config.h files all over WebKit and as it turns out when
+ building WTR with Qt on Windows we do end up with such a clash. Therefore
+ we need the same workaround.
+
+ * WebKitTestRunner/config.h:
+
2012-09-10 Christophe Dumez <[email protected]>
[WK2] New fast/forms/number/number-interactive-validation-required.html fails
Modified: trunk/Tools/WebKitTestRunner/config.h (128033 => 128034)
--- trunk/Tools/WebKitTestRunner/config.h 2012-09-10 09:09:14 UTC (rev 128033)
+++ trunk/Tools/WebKitTestRunner/config.h 2012-09-10 09:16:05 UTC (rev 128034)
@@ -48,4 +48,15 @@
#endif
#endif
+#if OS(WINDOWS)
+/* If we don't define these, they get defined in windef.h. */
+/* We want to use std::min and std::max. */
+#ifndef max
+#define max max
#endif
+#ifndef min
+#define min min
+#endif
+#endif
+
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
