diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:04:45 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-19 10:05:18 +0100 |
| commit | 73376eb43ccc692727fbff4c90a7b62d06c36cb7 (patch) | |
| tree | 5b8f7652af9db9058d805100e3f8a4d67830d834 /src/3rdparty/javascriptcore/JavaScriptCore/config.h | |
| parent | 488532c4ecb099efd1807b1dd5f237609f2299e8 (diff) | |
| parent | 0659af7ee80a6fc4ebfc75f97f61333dfde6abfb (diff) | |
| download | qtscript-73376eb43ccc692727fbff4c90a7b62d06c36cb7.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: Ie8a79e8c58e45eab13391377dd33750ff2d98c08
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. |