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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4385576..f1a2f14 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-14  Sam Weinig  <sam@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  <abarth@webkit.org>
 
         Implement an adb-based driver for the ChromiumAndroidPort

diff --git a/Tools/DumpRenderTree/DumpRenderTreePrefix.h b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
index 1344754..010ca01 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTreePrefix.h
+++ b/Tools/DumpRenderTree/DumpRenderTreePrefix.h
@@ -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

diff --git a/Tools/DumpRenderTree/cg/ImageDiffCG.cpp b/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
index 07e5113..e194a00 100644 (file)
--- a/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
+++ b/Tools/DumpRenderTree/cg/ImageDiffCG.cpp
@@ -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