[PATCH] D19344: [libc++] fix macro redef warning when exception is disabled

[Weiming Zhao via cfe-commits]

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
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D19344.54457.patch
Type: text/x-patch
Size: 346 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160421/0449cb96/attachment.bin>