diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-05-26 18:52:49 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-05-26 18:52:49 +0000 |
| commit | 9729cf09342823ba32d77ab1ea12b7ae84f7c904 (patch) | |
| tree | 87163f0ca4abe85acc120b605dcfa6b9c46b29cd /contrib/libc++/src/exception.cpp | |
| parent | d3dd0204252966f7ae13a28bba0f49356b4d3311 (diff) | |
| parent | bb5e33f003797b67974a8893f7f2930fc51b8210 (diff) | |
Notes
Diffstat (limited to 'contrib/libc++/src/exception.cpp')
| -rw-r--r-- | contrib/libc++/src/exception.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/libc++/src/exception.cpp b/contrib/libc++/src/exception.cpp index 2c16060a7583..e172f642d483 100644 --- a/contrib/libc++/src/exception.cpp +++ b/contrib/libc++/src/exception.cpp @@ -12,10 +12,6 @@ #include "exception" #include "new" -#ifndef __has_include -#define __has_include(inc) 0 -#endif - #if defined(__APPLE__) && !defined(LIBCXXRT) #include <cxxabi.h> @@ -29,16 +25,16 @@ #define __terminate_handler __cxxabiapple::__cxa_terminate_handler #define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler #endif // _LIBCPPABI_VERSION -#elif defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) || __has_include(<cxxabi.h>) +#elif defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) #include <cxxabi.h> using namespace __cxxabiv1; #if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION) #define HAVE_DEPENDENT_EH_ABI 1 #endif -#elif !defined(__GLIBCXX__) // __has_include(<cxxabi.h>) +#elif !defined(__GLIBCXX__) // defined(LIBCXX_BUILDING_LIBCXXABI) static std::terminate_handler __terminate_handler; static std::unexpected_handler __unexpected_handler; -#endif // __has_include(<cxxabi.h>) +#endif // defined(LIBCXX_BUILDING_LIBCXXABI) namespace std { |