Title: [107775] trunk/Tools
- Revision
- 107775
- Author
- wei...@apple.com
- Date
- 2012-02-14 20:10:26 -0800 (Tue, 14 Feb 2012)
Log Message
In DRT, don't #define min or max on non-Windows platforms, it just isn't needed
https://bugs.webkit.org/show_bug.cgi?id=78663
Reviewed by Anders Carlsson.
* DumpRenderTree/DumpRenderTreePrefix.h:
* DumpRenderTree/cg/ImageDiffCG.cpp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (107774 => 107775)
--- trunk/Tools/ChangeLog 2012-02-15 03:56:22 UTC (rev 107774)
+++ trunk/Tools/ChangeLog 2012-02-15 04:10:26 UTC (rev 107775)
@@ -1,3 +1,13 @@
+2012-02-14 Sam Weinig <s...@webkit.org>
+
+ In DRT, don't #define min or max on non-Windows platforms, it just isn't needed
+ https://bugs.webkit.org/show_bug.cgi?id=78663
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/DumpRenderTreePrefix.h:
+ * DumpRenderTree/cg/ImageDiffCG.cpp:
+
2012-02-14 Adam Barth <aba...@webkit.org>
Implement an adb-based driver for the ChromiumAndroidPort
Modified: trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h (107774 => 107775)
--- trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2012-02-15 03:56:22 UTC (rev 107774)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2012-02-15 04:10:26 UTC (rev 107775)
@@ -32,7 +32,11 @@
#endif
+#if defined(WIN32) || defined(_WIN32)
+
// If we don't define these, they get defined in windef.h.
// We want to use std::min and std::max
#define max max
#define min min
+
+#endif
Modified: trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (107774 => 107775)
--- trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2012-02-15 03:56:22 UTC (rev 107774)
+++ trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2012-02-15 04:10:26 UTC (rev 107775)
@@ -24,7 +24,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if defined(WIN32) || defined(_WIN32)
#define min min
+#endif
// FIXME: We need to be able to include these defines from a config.h somewhere.
#define JS_EXPORT_PRIVATE
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
