Remove configure code checking for various malloc alignments. Just us…

…e aligned_alloc internally instead. Fixes #278.

configure.ac

@@ -668,8 +668,6 @@ AC_CHECK_FUNCS([strtol memalign posix_memalign memset memmove munmap memcpy fsta
 QTHREAD_CHECK_QSORT
 AC_CHECK_DECLS([MADV_ACCESS_LWP],[],[],[[#include <sys/types.h>
 #include <sys/mman.h>]])
-AX_CHECK_PAGE_ALIGNED_MALLOC
-QTHREAD_CHECK_WORKING_VALLOC
 QTHREAD_CHECK_ASSERT([],[AC_MSG_ERROR([assert() does not seem to work])])
 
 AC_CACHE_SAVE

src/alloc/base.c

@@ -34,68 +34,11 @@ void *qt_realloc(void *ptr, size_t size) { return realloc(ptr, size); }
 void qt_internal_alignment_init(void) { _pagesize = getpagesize(); }
 
 void *qt_internal_aligned_alloc(size_t alloc_size, uint_fast16_t alignment) {
-  void *ret;
-
-  assert(alloc_size > 0);
-  switch (alignment) {
-    case 0: ret = MALLOC(alloc_size); break;
-    case 16:
-    case 8:
-    case 4:
-    case 2: ret = MALLOC(alloc_size); break;
-    default:
-#if defined(HAVE_WORKING_VALLOC)
-      if (alignment == pagesize) {
-        ret = valloc(alloc_size);
-        break;
-      }
-#elif defined(HAVE_PAGE_ALIGNED_MALLOC)
-      if (alignment == pagesize) {
-        ret = MALLOC(alloc_size);
-        break;
-      }
-#endif
-#if defined(HAVE_MEMALIGN)
-      ret = memalign(alignment, alloc_size);
-#elif defined(HAVE_POSIX_MEMALIGN)
-      posix_memalign(&(ret), alignment, alloc_size);
-#else
-    {
-      uint8_t *tmp = MALLOC((alloc_size + alignment - 1) + sizeof(void *));
-      if (!tmp) { return NULL; }
-      ret = (void *)(((uintptr_t)(tmp + sizeof(void *) + alignment - 1)) &
-                     ~(alignment - 1));
-      *((void **)ret - 1) = tmp;
-    } break;
-#endif /* if defined(HAVE_MEMALIGN) */
-  }
-  assert(ret);
-  assert(((uintptr_t)ret & (alignment - 1)) == 0);
-  return ret;
+  return aligned_alloc((size_t) alignment, alloc_size);
 }
 
 void qt_internal_aligned_free(void *ptr, uint_fast16_t alignment) {
-  assert(ptr);
-  switch (alignment) {
-    case 0: qt_free(ptr); break;
-    case 16:
-    case 8:
-    case 4:
-    case 2: qt_free(ptr); break;
-    default:
-#if defined(HAVE_WORKING_VALLOC) || defined(HAVE_PAGE_ALIGNED_MALLOC)
-      if (alignment == pagesize) {
-        qt_free(ptr);
-        break;
-      }
-#endif
-#if defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN)
-      qt_free(ptr);
-#else
-      assert((uintptr_t) * ((void **)ptr - 1) > 4096);
-      qt_free(*((void **)ptr - 1));
-#endif
-  }
+  qt_free(ptr);
 }
 
 /* vim:set expandtab: */