commit 8b5968b47ec78fa99bc473e7a70528e7c525bad3 Author: Tom Ritter <tom@mozilla.com> Date: Tue May 15 11:10:48 2018 -0500 Bug 1460720 - Do not define _aligned_malloc - instead define _aligned_malloc_impl and export _aligned_malloc. r=glandium, a=jcristau MozReview-Commit-ID: 3EwAd81Iz7r --HG-- extra : source : 144d50bc68914e2560e0fc22ba0fc445d0be6f8f --- memory/build/mozmemory_wrap.cpp | 2 +- memory/build/mozmemory_wrap.h | 1 + mozglue/build/mozglue.def.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/memory/build/mozmemory_wrap.cpp b/memory/build/mozmemory_wrap.cpp index 91eba2dd9598..385d9c46fea9 100644 --- a/memory/build/mozmemory_wrap.cpp +++ b/memory/build/mozmemory_wrap.cpp @@ -160,7 +160,7 @@ wcsdup_impl(const wchar_t* src) } MOZ_MEMORY_API void* -_aligned_malloc(size_t size, size_t alignment) +_aligned_malloc_impl(size_t size, size_t alignment) { return memalign_impl(alignment, size); } diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h index a3dd49904fd5..87754107e6a6 100644 --- a/memory/build/mozmemory_wrap.h +++ b/memory/build/mozmemory_wrap.h @@ -156,6 +156,7 @@ #define strdup_impl mozmem_dup_impl(strdup) #ifdef XP_WIN #define wcsdup_impl mozmem_dup_impl(wcsdup) +#define _aligned_malloc_impl mozmem_dup_impl(_aligned_malloc) #endif // String functions diff --git a/mozglue/build/mozglue.def.in b/mozglue/build/mozglue.def.in index 8cc622d206d7..b801f62f8c98 100644 --- a/mozglue/build/mozglue.def.in +++ b/mozglue/build/mozglue.def.in @@ -15,7 +15,7 @@ EXPORTS malloc_usable_size=je_malloc_usable_size malloc_good_size=je_malloc_good_size _aligned_free=je_free - _aligned_malloc + _aligned_malloc=wrap__aligned_malloc strndup=wrap_strndup strdup=wrap_strdup _strdup=wrap_strdup