diff options
Diffstat (limited to 'libcxxabi/src/cxa_exception.hpp')
| -rw-r--r-- | libcxxabi/src/cxa_exception.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp index 9b22ce3719e..8badb3b7fc1 100644 --- a/libcxxabi/src/cxa_exception.hpp +++ b/libcxxabi/src/cxa_exception.hpp @@ -27,7 +27,7 @@ static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask for CLNGC++ struct __cxa_exception { -#if __LP64__ || LIBCXXABI_ARM_EHABI +#if defined(__LP64__) || LIBCXXABI_ARM_EHABI // This is a new field to support C++ 0x exception_ptr. // For binary compatibility it is at the start of this // struct which is prepended to the object thrown in @@ -56,7 +56,7 @@ struct __cxa_exception { void *adjustedPtr; #endif -#if !__LP64__ && !LIBCXXABI_ARM_EHABI +#if !defined(__LP64__) && !LIBCXXABI_ARM_EHABI // This is a new field to support C++ 0x exception_ptr. // For binary compatibility it is placed where the compiler // previously adding padded to 64-bit align unwindHeader. @@ -70,7 +70,7 @@ struct __cxa_exception { // The layout of this structure MUST match the layout of __cxa_exception, with // primaryException instead of referenceCount. struct __cxa_dependent_exception { -#if __LP64__ || LIBCXXABI_ARM_EHABI +#if defined(__LP64__) || LIBCXXABI_ARM_EHABI void* primaryException; #endif @@ -94,7 +94,7 @@ struct __cxa_dependent_exception { void *adjustedPtr; #endif -#if !__LP64__ && !LIBCXXABI_ARM_EHABI +#if !defined(__LP64__) && !LIBCXXABI_ARM_EHABI void* primaryException; #endif |
