diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-02-07 16:16:38 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-09 10:38:45 +0100 |
| commit | 1404a36f104e3a862d8eb969313a720867e37243 (patch) | |
| tree | 0d374fa26ab940d588cdbb3323844f2e9b80fcd2 /src/3rdparty | |
| parent | 8dc79abcf519c8b30c19dd65fcb7ee3e007f3f20 (diff) | |
Work around broken min/max macro definitions on Windows
Windows defines min and max to macros, which breaks code that for
example uses std::max. Defining NOMINMAX globally prevents WinDefs.h
from defining those macros.
Change-Id: Ib79a48f9139febd1429a11753ffef4430953a3b4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 34b86e30e4..5744905f93 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -1,6 +1,8 @@ DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" +win*: DEFINES += NOMINMAX + DEFINES += ENABLE_LLINT=0 DEFINES += ENABLE_DFG_JIT=0 DEFINES += ENABLE_JIT=1 |