Changeset 18087 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Dec 8, 2006, 2:34:07 PM (18 years ago)

Author:

aroben

Message:

JavaScriptCore:

Reviewed by Anders.

This is a mo' better fix for ensuring we don't use macro definitiones
of min/max.

• kjs/config.h:
• wtf/Vector.h:

WebCore:

Reviewed by Anders.

This is a mo' better fix for ensuring we don't use macro definitiones
of min/max.

• config.h:

File:

• trunk/JavaScriptCore/kjs/config.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/config.h

@@ -36 +36 @@
 #elif PLATFORM(WIN_OS)
 
-// 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
 
 #define HAVE_FLOAT_H 1
 #define HAVE_FUNC__FINITE 1
 #define HAVE_SYS_TIMEB_H 1
+
 
 #define USE_SYSTEM_MALLOC 1