From 1404a36f104e3a862d8eb969313a720867e37243 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 7 Feb 2013 16:16:38 +0100 Subject: [PATCH] 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 --- src/3rdparty/masm/masm-defs.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index 34b86e3..5744905 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 -- 2.7.4