diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-05 15:28:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 17:07:45 +0100 |
| commit | fbe7ad18c35aa662693836a65af1e5b67522e1bf (patch) | |
| tree | 6e0aa818ab83b7b5226ca8a03eee1602419dec85 | |
| parent | 7e1803d382fd199bae12c8e13cd710e51e633a09 (diff) | |
| download | qtscript-fbe7ad18c35aa662693836a65af1e5b67522e1bf.tar.gz | |
Fix compile error caused by min/max defines.
qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check
for min/max which causes a compile error.
Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -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. |