Work around broken min/max macro definitions on Windows
authorSimon Hausmann <simon.hausmann@digia.com>
Thu, 7 Feb 2013 15:16:38 +0000 (16:16 +0100)
committerLars Knoll <lars.knoll@digia.com>
Sat, 9 Feb 2013 09:38:45 +0000 (10:38 +0100)
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>
src/3rdparty/masm/masm-defs.pri

index 34b86e3..5744905 100644 (file)
@@ -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