OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Define _ALLOW_KEYWORD_MACROS on MSVC builds.

Browse Source 
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>
This commit is contained in:
José Fonseca
2013-03-14 17:40:14 +00:00
parent 6a3d77e13d
commit a35a19a6ea
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/c99_compat.h
View File

@@ -37,12 +37,10 @@
* Visual Studio 2012 will complain if we define the `inline` keyword, but * Visual Studio 2012 will complain if we define the `inline` keyword, but
* actually it only supports the keyword on C++. * actually it only supports the keyword on C++.
* *
* We could skip this check by defining _ALLOW_KEYWORD_MACROS, but there is * To avoid this the _ALLOW_KEYWORD_MACROS must be set.
* probably value in checking this for other keywords. So simply include
* the checking before we define it below.
*/ */
# if _MSC_VER >= 1700 # if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS)
# include <xkeycheck.h> # define _ALLOW_KEYWORD_MACROS
# endif # endif
/* /*

1
scons/gallium.py
View File

@@ -289,6 +289,7 @@ def generate(env):
'_CRT_SECURE_NO_DEPRECATE', '_CRT_SECURE_NO_DEPRECATE',
'_SCL_SECURE_NO_WARNINGS', '_SCL_SECURE_NO_WARNINGS',
'_SCL_SECURE_NO_DEPRECATE', '_SCL_SECURE_NO_DEPRECATE',
'_ALLOW_KEYWORD_MACROS',
] ]
if env['build'] in ('debug', 'checked'): if env['build'] in ('debug', 'checked'):
cppdefines += ['_DEBUG'] cppdefines += ['_DEBUG']