diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 15:54:59 -0800 |
| commit | 2f4401a79e96917f78876c3e09b8d31754a26f70 (patch) | |
| tree | 8ac45e1d7b302a9f0aaa7e9b9e74aff01965a93d /system/lib/libcxxabi/include/cxxabi.h | |
| parent | 2c8c19f60585d4e8cb78af119faba664a35e2268 (diff) | |
| parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/lib/libcxxabi/include/cxxabi.h')
| -rw-r--r-- | system/lib/libcxxabi/include/cxxabi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/lib/libcxxabi/include/cxxabi.h b/system/lib/libcxxabi/include/cxxabi.h index b08fba0e..66ef6d46 100644 --- a/system/lib/libcxxabi/include/cxxabi.h +++ b/system/lib/libcxxabi/include/cxxabi.h @@ -64,7 +64,7 @@ extern LIBCXXABI_NORETURN void __cxa_pure_virtual(void); extern LIBCXXABI_NORETURN void __cxa_deleted_virtual(void); // 3.3.2 One-time Construction API -#ifdef LIBCXXABI_ARMEABI +#if __arm__ extern int __cxa_guard_acquire(uint32_t*); extern void __cxa_guard_release(uint32_t*); extern void __cxa_guard_abort(uint32_t*); |