diff options
| author | Jose Fonseca <[email protected]> | 2016-02-12 12:21:39 +0000 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2016-02-12 14:51:28 +0000 |
| commit | 950da38164095217fb6a06acae750eee5d336ba7 (patch) | |
| tree | d3c940ee350c2168938d892068093be71433e1e3 /src/mesa/main/imports.c | |
| parent | c69ef377c8b30ee8d4088cfc586fe4100a5f0e62 (diff) | |
mesa: Use _aligned_malloc/free for MinGW too.
We already use these for gallium in
src/gallium/auxiliary/os/os_memory_stdc.h and it's always better to
minimize divergences between MinGW and MSVC.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/imports.c')
| -rw-r--r-- | src/mesa/main/imports.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 230ebbc67f4..14cd58870f7 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -89,7 +89,7 @@ _mesa_align_malloc(size_t bytes, unsigned long alignment) if (err) return NULL; return mem; -#elif defined(_WIN32) && defined(_MSC_VER) +#elif defined(_WIN32) return _aligned_malloc(bytes, alignment); #else uintptr_t ptr, buf; @@ -131,7 +131,7 @@ _mesa_align_calloc(size_t bytes, unsigned long alignment) } return mem; -#elif defined(_WIN32) && defined(_MSC_VER) +#elif defined(_WIN32) void *mem; mem = _aligned_malloc(bytes, alignment); @@ -178,7 +178,7 @@ _mesa_align_free(void *ptr) { #if defined(HAVE_POSIX_MEMALIGN) free(ptr); -#elif defined(_WIN32) && defined(_MSC_VER) +#elif defined(_WIN32) _aligned_free(ptr); #else if (ptr) { @@ -196,7 +196,7 @@ void * _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize, unsigned long alignment) { -#if defined(_WIN32) && defined(_MSC_VER) +#if defined(_WIN32) (void) oldSize; return _aligned_realloc(oldBuffer, newSize, alignment); #else |