From 7cfb353334c725b3f57a4a2951b4ff9e352fc956 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 26 Jul 2019 14:02:14 -0700 Subject: Don't explicitly check for standard functions --- common/almalloc.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'common/almalloc.cpp') diff --git a/common/almalloc.cpp b/common/almalloc.cpp index f94ae8bc..2902a087 100644 --- a/common/almalloc.cpp +++ b/common/almalloc.cpp @@ -17,12 +17,14 @@ #endif +#define ALIGNED_ALLOC_AVAILABLE (__STDC_VERSION__ >= 201112L || __cplusplus >= 201703L) + void *al_malloc(size_t alignment, size_t size) { assert((alignment & (alignment-1)) == 0); alignment = std::max(alignment, alignof(std::max_align_t)); -#if defined(HAVE_ALIGNED_ALLOC) +#if ALIGNED_ALLOC_AVAILABLE size = (size+(alignment-1))&~(alignment-1); return aligned_alloc(alignment, size); #elif defined(HAVE_POSIX_MEMALIGN) @@ -53,7 +55,7 @@ void *al_calloc(size_t alignment, size_t size) void al_free(void *ptr) noexcept { -#if defined(HAVE_ALIGNED_ALLOC) || defined(HAVE_POSIX_MEMALIGN) +#if ALIGNED_ALLOC_AVAILABLE || defined(HAVE_POSIX_MEMALIGN) free(ptr); #elif defined(HAVE__ALIGNED_MALLOC) _aligned_free(ptr); -- cgit v1.2.3