aboutsummaryrefslogtreecommitdiff
path: root/libcxxabi
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-05-11 02:01:05 +0000
committerEric Fiselier <eric@efcs.ca>2017-05-11 02:01:05 +0000
commit9226279daa6f38a060908080e3007bfb43b4694f (patch)
tree3bf99450ec025b3f724b54ec04bd2dfb0d54d46d /libcxxabi
parentf57d5d08ba77b4386394573989bb79fb56b18a31 (diff)
downloadllvm-9226279daa6f38a060908080e3007bfb43b4694f.zip
llvm-9226279daa6f38a060908080e3007bfb43b4694f.tar.gz
llvm-9226279daa6f38a060908080e3007bfb43b4694f.tar.bz2
Don't use posix_memalign under MinGW
llvm-svn: 302755
Diffstat (limited to 'libcxxabi')
-rw-r--r--libcxxabi/src/stdlib_new_delete.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxxabi/src/stdlib_new_delete.cpp b/libcxxabi/src/stdlib_new_delete.cpp
index ffd174c..0e85f6ad 100644
--- a/libcxxabi/src/stdlib_new_delete.cpp
+++ b/libcxxabi/src/stdlib_new_delete.cpp
@@ -146,7 +146,7 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC
if (static_cast<size_t>(alignment) < sizeof(void*))
alignment = std::align_val_t(sizeof(void*));
void* p;
-#if defined(_LIBCPP_MSVCRT)
+#if defined(_LIBCPP_WIN32API)
while ((p = _aligned_malloc(size, static_cast<size_t>(alignment))) == nullptr)
#else
while (::posix_memalign(&p, static_cast<size_t>(alignment), size) != 0)
@@ -219,7 +219,7 @@ void
operator delete(void* ptr, std::align_val_t) _NOEXCEPT
{
if (ptr)
-#if defined(_LIBCPP_MSVCRT)
+#if defined(_LIBCPP_WIN32API)
::_aligned_free(ptr);
#else
::free(ptr);