summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-03-14 17:40:14 +0000
committerJosé Fonseca <jfonseca@vmware.com>2013-03-15 19:55:26 +0000
commit5d66947d66c4f80d4a26ad19029ecb6697a19e61 (patch)
treeaccd2d18ee75d24a590e728d8737f2141c35def1
parent0acc79322b2505e7d2e3e0ad98b2df98b9ed5bf7 (diff)
scons: Define _ALLOW_KEYWORD_MACROS on MSVC builds.
scons/llvm.py defines inline globally to workaround issues with LLVM C binding headers, so the only way to is to avoid aggravating xkeycheck.h errors is to set _ALLOW_KEYWORD_MACROS. This fixes MSVC 2012 build with LLVM. Reviewed-by: Brian Paul <brianp@vmware.com>
-rwxr-xr-xscons/gallium.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 4b51b6e7cbf..4d3de82d59c 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -289,6 +289,7 @@ def generate(env):
'_CRT_SECURE_NO_DEPRECATE',
'_SCL_SECURE_NO_WARNINGS',
'_SCL_SECURE_NO_DEPRECATE',
+ '_ALLOW_KEYWORD_MACROS',
]
if env['build'] in ('debug', 'checked'):
cppdefines += ['_DEBUG']