X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=WebCore%2Fconfig.h;h=e5bf68fb561388123cb400fb89ecc005e0f834e7;hp=0647394eca8bcd5b8ff01e57daa5fa10f4ab260f;hb=e0f41d847941767658627f042106a9c74ccbe881;hpb=66b1a44afb1dffde4d669dff0e98229500e40b56 diff --git a/WebCore/config.h b/WebCore/config.h index 0647394eca8b..e5bf68fb5613 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -49,9 +49,10 @@ typedef float CGFloat; #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.