diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-10-11 00:18:54 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-10-11 00:18:54 +0000 |
| commit | a44944b7a37c0f561683f230fc87efac783d7c8f (patch) | |
| tree | c52fecb5c7efa7e4a970e24c7519b4a1df522d73 /libcxxabi | |
| parent | 1d97e2ba2683a50fe6e146328221033053bf0d1f (diff) | |
Update libc++abi's detection of aligned allocation after r344207.
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/fallback_malloc.cpp | 4 | ||||
| -rw-r--r-- | libcxxabi/src/stdlib_new_delete.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp index bec9952596b..150a4bb608a 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -// Define _LIBCPP_BUILDING_LIBRARY to ensure _LIBCPP_HAS_NO_ALIGNED_ALLOCATION +// Define _LIBCPP_BUILDING_LIBRARY to ensure _LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION // is only defined when libc aligned allocation is not available. #define _LIBCPP_BUILDING_LIBRARY #include "fallback_malloc.h" @@ -209,7 +209,7 @@ void* __aligned_malloc_with_fallback(size_t size) { #if defined(_WIN32) if (void* dest = _aligned_malloc(size, alignof(__aligned_type))) return dest; -#elif defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) +#elif defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) if (void* dest = std::malloc(size)) return dest; #else diff --git a/libcxxabi/src/stdlib_new_delete.cpp b/libcxxabi/src/stdlib_new_delete.cpp index 686ad07ccd5..bbd90a5b26d 100644 --- a/libcxxabi/src/stdlib_new_delete.cpp +++ b/libcxxabi/src/stdlib_new_delete.cpp @@ -134,7 +134,7 @@ operator delete[] (void* ptr, size_t) _NOEXCEPT ::operator delete[](ptr); } -#if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) +#if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) _LIBCXXABI_WEAK void * @@ -260,4 +260,4 @@ operator delete[] (void* ptr, size_t, std::align_val_t alignment) _NOEXCEPT ::operator delete[](ptr, alignment); } -#endif // !_LIBCPP_HAS_NO_ALIGNED_ALLOCATION +#endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION |