Mesa (9.1): scons: Define _ALLOW_KEYWORD_MACROS on MSVC builds.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Mar 15 19:55:31 UTC 2013


Module: Mesa
Branch: 9.1
Commit: 5d66947d66c4f80d4a26ad19029ecb6697a19e61
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d66947d66c4f80d4a26ad19029ecb6697a19e61

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Mar 14 17:40:14 2013 +0000

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 at vmware.com>

---

 scons/gallium.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index 4b51b6e..4d3de82 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']




More information about the mesa-commit mailing list