diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-10-01 21:43:02 +0300 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-10-01 21:43:02 +0300 |
| commit | 04501a22a073d0f64e980aaa8c895a6e86c0a103 (patch) | |
| tree | f6fcc36facda36f7093498ea88cad3b7b69f1a6c /libcxxabi/src/cxa_default_handlers.cpp | |
| parent | ae40dfc1e3ce5f64be3234ed7958792f15800181 (diff) | |
[libc++abi] Remove uses of C++ headers when possible
This reduces the (circular) dependency of libc++abi on a C++ standard
library. Outside of the demangler which uses fancier C++ features, the
only C++ headers now required by libc++abi are pretty much <new> and
<exception>, and that's because libc++abi defines some types that are
declared in those headers.
llvm-svn: 373381
Diffstat (limited to 'libcxxabi/src/cxa_default_handlers.cpp')
| -rw-r--r-- | libcxxabi/src/cxa_default_handlers.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index 91a63f537662..97192bc788f3 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/src/cxa_default_handlers.cpp @@ -8,10 +8,8 @@ // This file implements the default terminate_handler and unexpected_handler. //===----------------------------------------------------------------------===// -#include <stdexcept> -#include <new> #include <exception> -#include <cstdlib> +#include <stdlib.h> #include "abort_message.h" #include "cxxabi.h" #include "cxa_handlers.h" @@ -87,7 +85,7 @@ static void demangling_unexpected_handler() static std::terminate_handler default_terminate_handler = demangling_terminate_handler; static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler; #else -static std::terminate_handler default_terminate_handler = std::abort; +static std::terminate_handler default_terminate_handler = ::abort; static std::terminate_handler default_unexpected_handler = std::terminate; #endif |