[libcxx] r338531 - [libc++] Fix GCC 7.2.0 macro redefinition warning

[Louis Dionne via cfe-commits]

Author: ldionne
Date: Wed Aug  1 06:13:14 2018
New Revision: 338531

URL: http://llvm.org/viewvc/llvm-project?rev=338531&view=rev
Log:
[libc++] Fix GCC 7.2.0 macro redefinition warning

The warning happens when LIBCXX_ENABLE_EXCEPTIONS cmake option is not set,
and it fires every time __config is included, 33 in total.

Patch by Jason Lovett
Reviewed as https://reviews.llvm.org/D49997

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=338531&r1=338530&r2=338531&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Wed Aug  1 06:13:14 2018
@@ -510,7 +510,7 @@ namespace std {
 #define _LIBCPP_HAS_IS_BASE_OF
 #endif
 
-#if !__EXCEPTIONS
+#if !__EXCEPTIONS && !defined(_LIBCPP_NO_EXCEPTIONS)
 #define _LIBCPP_NO_EXCEPTIONS
 #endif