JavaScriptCore:

[WebKit-https.git] / WebCore / config.h

diff --git a/WebCore/config.h b/WebCore/config.h
index 0647394eca8bcd5b8ff01e57daa5fa10f4ab260f..e5bf68fb561388123cb400fb89ecc005e0f834e7 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -49,9 +49,10 @@ typedef float CGFloat;
 #define WINVER 0x0500
 #endif
 
 #define WINVER 0x0500
 #endif
 

-// We need to define this in order to use the numeric limit 
-// values provided by the C++ standard library.
-#define NOMINMAX
+// 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

 
 // Hack to match configuration of JavaScriptCore.
 // Maybe there's a better way to do this.
 
 // Hack to match configuration of JavaScriptCore.
 // Maybe there's a better way to do this.