wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1171122 - Swap some XP_MACOSX for XP_DARWIN in mozalloc. r=glandium

Browse Source
This commit is contained in:
Ted Mielczarek 2015-03-27 22:53:02 -04:00
parent 46ff58d424
commit ddad6dd5c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
memory/mozalloc/mozalloc.cpp
View File

@ -19,7 +19,7 @@
#define MOZ_MEMORY_IMPL
#include "mozmemory_wrap.h"
#if defined(XP_MACOSX)
#if defined(XP_DARWIN)
#include <malloc/malloc.h> // for malloc_size
#endif
@ -153,7 +153,7 @@ moz_posix_memalign(void **ptr, size_t alignment, size_t size)
if (code)
return code;
#if defined(XP_MACOSX)
#if defined(XP_DARWIN)
// Workaround faulty OSX posix_memalign, which provides memory with the
// incorrect alignment sometimes, but returns 0 as if nothing was wrong.
size_t mask = alignment - 1;
@ -203,7 +203,7 @@ moz_malloc_usable_size(void *ptr)
if (!ptr)
return 0;
#if defined(XP_MACOSX)
#if defined(XP_DARWIN)
return malloc_size(ptr);
#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
return malloc_usable_size_impl(ptr);