weimingz retitled this revision from "[libc++] fix constexpr error when build 
with MUSL and macro redef warning when no exception" to "[libc++] fix macro 
redef warning when exception is disabled".
weimingz updated the summary for this revision.
weimingz updated this revision to Diff 54457.

http://reviews.llvm.org/D19344

Files:
  include/__config

Index: include/__config
===================================================================
--- include/__config
+++ include/__config
@@ -297,7 +297,7 @@
 typedef __char32_t char32_t;
 #endif
 
-#if !(__has_feature(cxx_exceptions))
+#if !(__has_feature(cxx_exceptions)) && !defined(_LIBCPP_NO_EXCEPTIONS)
 #define _LIBCPP_NO_EXCEPTIONS
 #endif
 


Index: include/__config
===================================================================
--- include/__config
+++ include/__config
@@ -297,7 +297,7 @@
 typedef __char32_t char32_t;
 #endif
 
-#if !(__has_feature(cxx_exceptions))
+#if !(__has_feature(cxx_exceptions)) && !defined(_LIBCPP_NO_EXCEPTIONS)
 #define _LIBCPP_NO_EXCEPTIONS
 #endif
 
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to