Title: [126356] trunk/Tools
- Revision
- 126356
- Author
- [email protected]
- Date
- 2012-08-22 14:55:25 -0700 (Wed, 22 Aug 2012)
Log Message
Don't unconditionally define NOMINMAX on Windows
https://bugs.webkit.org/show_bug.cgi?id=94742
Patch by Scott Graham <[email protected]> on 2012-08-22
Reviewed by Adrienne Walker.
Avoids a warning when building on Windows when NOMINMAX is defined
elsewhere or on the command line.
* TestWebKitAPI/config.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (126355 => 126356)
--- trunk/Tools/ChangeLog 2012-08-22 21:55:10 UTC (rev 126355)
+++ trunk/Tools/ChangeLog 2012-08-22 21:55:25 UTC (rev 126356)
@@ -1,3 +1,15 @@
+2012-08-22 Scott Graham <[email protected]>
+
+ Don't unconditionally define NOMINMAX on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=94742
+
+ Reviewed by Adrienne Walker.
+
+ Avoids a warning when building on Windows when NOMINMAX is defined
+ elsewhere or on the command line.
+
+ * TestWebKitAPI/config.h:
+
2012-08-22 Zan Dobersek <[email protected]>
REGRESSION(r126189): Reftest mismatches are (again) run through ImageDiff with 0.1 tolerance
Modified: trunk/Tools/TestWebKitAPI/config.h (126355 => 126356)
--- trunk/Tools/TestWebKitAPI/config.h 2012-08-22 21:55:10 UTC (rev 126355)
+++ trunk/Tools/TestWebKitAPI/config.h 2012-08-22 21:55:25 UTC (rev 126356)
@@ -43,7 +43,9 @@
#elif defined(WIN32) || defined(_WIN32)
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
