diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-03-01 02:23:54 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-03-01 02:23:54 +0000 |
| commit | 9e2169efef5bd447dac9620c9c76fe4020e9b7e8 (patch) | |
| tree | cf7a0ef8290b66c483bade8b0839740392371427 /include | |
| parent | 3f19f77facd5f93d9fb97201a8f93fbd450f0c43 (diff) | |
Fix non-reserved macro names LIBCXXABI_NORETURN and LIBCXXABI_ARM_EHABI.
This patch adds the required leading underscore to those macros.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@296567 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/__cxxabi_config.h | 4 | ||||
| -rw-r--r-- | include/cxxabi.h | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h index 2c58a22..e51b377 100644 --- a/include/__cxxabi_config.h +++ b/include/__cxxabi_config.h @@ -12,9 +12,9 @@ #if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ !defined(__ARM_DWARF_EH__) -#define LIBCXXABI_ARM_EHABI 1 +#define _LIBCXXABI_ARM_EHABI 1 #else -#define LIBCXXABI_ARM_EHABI 0 +#define _LIBCXXABI_ARM_EHABI 0 #endif #if !defined(__has_attribute) diff --git a/include/cxxabi.h b/include/cxxabi.h index e4a6797..b5be338 100644 --- a/include/cxxabi.h +++ b/include/cxxabi.h @@ -21,7 +21,7 @@ #include <__cxxabi_config.h> #define _LIBCPPABI_VERSION 1002 -#define LIBCXXABI_NORETURN __attribute__((noreturn)) +#define _LIBCXXABI_NORETURN __attribute__((noreturn)) #ifdef __cplusplus @@ -45,7 +45,7 @@ extern _LIBCXXABI_FUNC_VIS void __cxa_free_exception(void *thrown_exception) throw(); // 2.4.3 Throwing the Exception Object -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_throw(void *thrown_exception, std::type_info *tinfo, void (*dest)(void *)); @@ -55,7 +55,7 @@ __cxa_get_exception_ptr(void *exceptionObject) throw(); extern _LIBCXXABI_FUNC_VIS void * __cxa_begin_catch(void *exceptionObject) throw(); extern _LIBCXXABI_FUNC_VIS void __cxa_end_catch(); -#if LIBCXXABI_ARM_EHABI +#if _LIBCXXABI_ARM_EHABI extern _LIBCXXABI_FUNC_VIS bool __cxa_begin_cleanup(void *exceptionObject) throw(); extern _LIBCXXABI_FUNC_VIS void __cxa_end_cleanup(); @@ -63,19 +63,19 @@ extern _LIBCXXABI_FUNC_VIS void __cxa_end_cleanup(); extern _LIBCXXABI_FUNC_VIS std::type_info *__cxa_current_exception_type(); // 2.5.4 Rethrowing Exceptions -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_rethrow(); +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_rethrow(); // 2.6 Auxiliary Runtime APIs -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_bad_cast(void); -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_bad_typeid(void); -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_cast(void); +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_typeid(void); +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_throw_bad_array_new_length(void); // 3.2.6 Pure Virtual Function API -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_pure_virtual(void); +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_pure_virtual(void); // 3.2.7 Deleted Virtual Function API -extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_deleted_virtual(void); +extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_deleted_virtual(void); // 3.3.2 One-time Construction API #ifdef __arm__ |