diff options
author | 2019-06-17 22:19:32 +0000 | |
---|---|---|
committer | 2019-06-17 22:19:32 +0000 | |
commit | cda1a52ccfcf3aa72394616b283e25bd09f86143 (patch) | |
tree | 18616d5657e9877a5c78949dcac36160953df788 /lib/libcxxabi/src/fallback_malloc.cpp | |
parent | Import libc++ 8.0.0. (diff) | |
download | wireguard-openbsd-cda1a52ccfcf3aa72394616b283e25bd09f86143.tar.xz wireguard-openbsd-cda1a52ccfcf3aa72394616b283e25bd09f86143.zip |
Import libc++abi 8.0.0.
Diffstat (limited to 'lib/libcxxabi/src/fallback_malloc.cpp')
-rw-r--r-- | lib/libcxxabi/src/fallback_malloc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcxxabi/src/fallback_malloc.cpp b/lib/libcxxabi/src/fallback_malloc.cpp index bec9952596b..202a46732a3 100644 --- a/lib/libcxxabi/src/fallback_malloc.cpp +++ b/lib/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,14 +209,14 @@ 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 if (size == 0) size = 1; void* dest; - if (::posix_memalign(&dest, alignof(__aligned_type), size) == 0) + if (::posix_memalign(&dest, __alignof(__aligned_type), size) == 0) return dest; #endif return fallback_malloc(size); |