diff options
Diffstat (limited to 'contrib/libc++/src/new.cpp')
| -rw-r--r-- | contrib/libc++/src/new.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/libc++/src/new.cpp b/contrib/libc++/src/new.cpp index 1fb4b2d..3ad593a 100644 --- a/contrib/libc++/src/new.cpp +++ b/contrib/libc++/src/new.cpp @@ -11,6 +11,10 @@ #include "new" +#ifndef __has_include +#define __has_include(inc) 0 +#endif + #if __APPLE__ #include <cxxabi.h> @@ -21,7 +25,12 @@ #define __new_handler __cxxabiapple::__cxa_new_handler #endif #else // __APPLE__ - static std::new_handler __new_handler; + #if defined(LIBCXXRT) || __has_include(<cxxabi.h>) + #include <cxxabi.h> + #endif // __has_include(<cxxabi.h>) + #ifndef _LIBCPPABI_VERSION + static std::new_handler __new_handler; + #endif // _LIBCPPABI_VERSION #endif // Implement all new and delete operators as weak definitions |
