diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 20:43:10 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-21 20:43:10 -0800 |
| commit | 8aa6919b7acf0b4034735ac7ee597e946fefaf4d (patch) | |
| tree | 3ba77ead655e88db79243d4e00abcc73df5d3402 /system/lib/libcxxabi/include/cxxabi.h | |
| parent | 06bfe6541d88fda62a6b531e16250c63d85dcfe6 (diff) | |
| parent | 160cc728e0839e441897d951fa61020bc2176717 (diff) | |
merge 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*); |