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

[Weiming Zhao via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL266956: [libc++] fix macro redef warning when exception is disabled (authored by weimingz).

Changed prior to commit:
  http://reviews.llvm.org/D19344?vs=54457&id=54459#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D19344

Files:
  libcxx/trunk/include/__config

Index: libcxx/trunk/include/__config
===================================================================
--- libcxx/trunk/include/__config
+++ libcxx/trunk/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.54459.patch
Type: text/x-patch
Size: 385 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160421/44f1687c/attachment.bin>