From: Weiming Zhao <weimingz@codeaurora.org>
Date: Thu, 21 Apr 2016 05:28:18 +0000 (+0000)
Subject: [libc++] fix macro redef warning when exception is disabled
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d69a6d2b2864d3d601e5cbb42c45538f144ac8e2;p=platform%2Fupstream%2Fllvm.git

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

Summary:
 when setting LIBCXX_ENABLE_EXCEPTIONS=false, _LIBCPP_NO_EXCEPTIONS wil be defined in both commandline and _config

Reviewers: bcraig, EricWF

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D19344

llvm-svn: 266956
---

diff --git a/libcxx/include/__config b/libcxx/include/__config
index b82c708..a28a0a4 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -297,7 +297,7 @@ typedef __char16_t char16_t;
 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