diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-01-29 18:16:33 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-01-29 18:16:33 +0000 |
| commit | 87996f906a9c89f86b6d001f58e30d25a00a0f37 (patch) | |
| tree | 326487b39018e27d055512ee408f623938a62c6f /libcxx | |
| parent | 76073f8d2217be046b954eebd7fb25fe4526ec95 (diff) | |
| download | bcm5719-llvm-87996f906a9c89f86b6d001f58e30d25a00a0f37.tar.gz bcm5719-llvm-87996f906a9c89f86b6d001f58e30d25a00a0f37.zip | |
config: prevent the re-definition of a macro
This causes unnecessary warnings when building with `cl`. Newer
versions of the C standard permit the redefinition of the macro to the
same value (which is the case here), unfortunately, `cl` does not yet
implement this. Add a check to prevent the redefinition.
llvm-svn: 293439
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/__config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index e723180a3db..1fedc04d30a 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -12,8 +12,10 @@ #define _LIBCPP_CONFIG #if defined(_MSC_VER) && !defined(__clang__) +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER #endif +#endif #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER #pragma GCC system_header |
