diff options
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/config.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 2af2e71..6be10fc 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -39,10 +39,10 @@ #if OS(WINDOWS) -// 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 +// windef.h defines min and max unless NOMINMAX is defined. +#ifndef NOMINMAX +# define NOMINMAX +#endif #if !COMPILER(MSVC7) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. |