From f01ce692655b101b9037490458681a27bc293abf Mon Sep 17 00:00:00 2001
From: andersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat, 18 Nov 2006 03:15:42 +0000
Subject: [PATCH] 2006-11-17  Anders Carlsson  <acarlsson@apple.com>

        Reviewed by Adam.

        Make sure that we always use std::min and std::max instead of macros.

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * kjs/config.h:
        * wtf/Vector.h:


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17837 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 JavaScriptCore/ChangeLog                      | 10 ++++
 .../JavaScriptCore/JavaScriptCore.vcproj      | 48 +++++++++++++++++++
 JavaScriptCore/kjs/config.h                   |  5 ++
 JavaScriptCore/wtf/Vector.h                   |  4 --
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cfed22bc9c1d..69a0bf7b03bd 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-17  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Make sure that we always use std::min and std::max instead of macros.
+        
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * kjs/config.h:
+        * wtf/Vector.h:
+
 === Safari-521.31 ===
 
 2006-11-12  Geoffrey Garen  <ggaren@apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index e12a6a86179d..bdc8c91652d9 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -540,6 +540,14 @@
 				RelativePath="..\..\wtf\FastMallocInternal.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\wtf\Forward.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\GetPtr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\wtf\HashCountedSet.h"
 				>
@@ -568,10 +576,26 @@
 				RelativePath="..\..\wtf\HashTraits.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\wtf\ListRefPtr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\wtf\MathExtras.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\wtf\Noncopyable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\OwnArrayPtr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\OwnPtr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\wtf\PassRefPtr.h"
 				>
@@ -588,6 +612,30 @@
 				RelativePath="..\..\wtf\StringExtras.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\wtf\TCPageMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\TCSpinLock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\TCSystemAlloc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\UnusedParam.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\Vector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\VectorTraits.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="PCRE"
diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h
index d23794db8822..7031fbe5fdc5 100644
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -14,6 +14,11 @@
 
 #elif PLATFORM(WIN_OS)
 
+// 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
+
 #define HAVE_FLOAT_H 1
 #define HAVE_FUNC__FINITE 1
 #define HAVE_SYS_TIMEB_H 1
diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h
index 89f5fd518b25..496f1c761ed6 100644
--- a/JavaScriptCore/wtf/Vector.h
+++ b/JavaScriptCore/wtf/Vector.h
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <utility>
 
-// Temporary workaround for Win32.
-// We should use NOMINMAX instead.
-#undef max
-
 namespace WTF {
 
     using std::min;
-- 
2.36.0