Changeset 156302 in webkit for trunk/Source/JavaScriptCore/config.h

Timestamp:

Sep 23, 2013, 3:25:25 PM (12 years ago)

Author:

Patrick Gansterer

Message:

use NOMINMAX instead of #define min min
​https://bugs.webkit.org/show_bug.cgi?id=73563

Reviewed by Brent Fulgham.

Use NOMINMAX instead of #define min/max as a cleaner
way of ensuring that Windows system header files don't
define min/max as macro in the first place.

Source/JavaScriptCore:

• config.h:

Source/WebCore:

• WebCorePrefix.h:
• config.h:

Source/WebKit/win:

• WebKitPrefix.h:

Source/WebKit2:

• config.h:

Source/WTF:

• config.h:

Tools:

• DumpRenderTree/DumpRenderTreePrefix.h:
• DumpRenderTree/cg/ImageDiffCG.cpp:
• DumpRenderTree/config.h:
• DumpRenderTree/win/ImageDiffCairo.cpp:
• WebKitTestRunner/WebKitTestRunnerPrefix.h:
• WebKitTestRunner/config.h:

WebKitLibraries:

• win/tools/vsprops/common.props:

File:

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

trunk/Source/JavaScriptCore/config.h

@@ -44 +44 @@
 #endif
 
-// 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
-
 #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.