Update libc++abi's detection of aligned allocation after r344207.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@344208 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/fallback_malloc.cpp b/src/fallback_malloc.cpp
index bec9952..150a4bb 100644
--- a/src/fallback_malloc.cpp
+++ b/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 @@
#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/src/stdlib_new_delete.cpp b/src/stdlib_new_delete.cpp
index 686ad07..bbd90a5 100644
--- a/src/stdlib_new_delete.cpp
+++ b/src/stdlib_new_delete.cpp
@@ -134,7 +134,7 @@
::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[](ptr, alignment);
}
-#endif // !_LIBCPP_HAS_NO_ALIGNED_ALLOCATION
+#endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION
