From 9e01ced1d14467c06d7e1db57982556c9e861372 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Thu, 29 Oct 2009 18:07:06 +0100
Subject: Remove the posix_memalign and Win32 _aligned_malloc

MinGW doesn't have _aligned_malloc and posix_memalign doesn't have a
realloc function. So use our own implementation in all platforms.

Removing posix_memalign was reviewed by Brad, but I apparently lost
the commit.

Reviewed-by: Trust Me
---
 src/corelib/global/qmalloc.cpp | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index 3584c50..4aab1bd 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -43,10 +43,6 @@
 
 #include <stdlib.h>
 
-#ifdef Q_OS_WIN
-# include <malloc.h>
-#endif
-
 /*
     Define the container allocation functions in a separate file, so that our
     users can easily override them.
@@ -71,38 +67,11 @@ void *qRealloc(void *ptr, size_t size)
 
 void *qMallocAligned(size_t size, size_t alignment)
 {
-#if defined(Q_OS_WIN)
-    return _aligned_malloc(size, alignment);
-#elif defined(HAVE_POSIX_MEMALIGN)
-    if (alignment <= sizeof(void*))
-        return qMalloc(size);
-
-    // we have posix_memalign
-    void *ptr = 0;
-    if (posix_memalign(&ptr, alignment, size) == 0)
-        return ptr;
-    return 0;
-#else
     return qReallocAligned(0, size, 0, alignment);
-#endif
 }
 
 void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t alignment)
 {
-#if defined(Q_OS_WIN)
-    Q_UNUSED(oldsize);
-    return _aligned_realloc(oldptr, newsize, alignment);
-#elif defined(HAVE_POSIX_MEMALIGN)
-    if (alignment <= sizeof(void*))
-        return qRealloc(oldptr, newsize);
-
-    void *newptr = qMallocAligned(newsize, alignment);
-    if (!newptr)
-        return 0;
-    qMemCopy(newptr, oldptr, qMin(oldsize, newsize));
-    qFree(oldptr);
-    return newptr;
-#else
     // fake an aligned allocation
     Q_UNUSED(oldsize);
 
@@ -144,21 +113,14 @@ void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t align
     faked.pptr[-1] = real.ptr;
 
     return faked.ptr;
-#endif
 }
 
 void qFreeAligned(void *ptr)
 {
-#if defined(Q_OS_WIN)
-    _aligned_free(ptr);
-#elif defined(HAVE_POSIX_MEMALIGN)
-    ::free(ptr);
-#else
     if (!ptr)
         return;
     void **ptr2 = static_cast<void **>(ptr);
     free(ptr2[-1]);
-#endif
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12