Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1365460 - Define _malloc_message as a function instead of a pointer to a function. r=njn

Browse Source 
--HG--
extra : rebase_source : ea3088ad12ae2e0879beceac48f01ecdeb5c8f3a
This commit is contained in:
Mike Hommey 2017-05-18 10:18:36 +09:00
parent d1b9ff45e8
commit 72d4bc9cc3
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
memory/mozjemalloc/mozjemalloc.cpp
View File

@ -1101,8 +1101,6 @@ static bool opt_xmalloc = false;
static char *umax2s(uintmax_t x, unsigned base, char *s);
static bool malloc_mutex_init(malloc_mutex_t *mutex);
static bool malloc_spin_init(malloc_spinlock_t *lock);
static void wrtmessage(const char *p1, const char *p2, const char *p3,
const char *p4);
#ifdef MOZ_MEMORY_DARWIN
/* Avoid namespace collision with OS X's malloc APIs. */
#define malloc_printf moz_malloc_printf
@ -1238,7 +1236,7 @@ umax2s(uintmax_t x, unsigned base, char *s)
}
static void
wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
_malloc_message(const char *p1, const char *p2, const char *p3, const char *p4)
{
#if !defined(MOZ_MEMORY_WINDOWS)
#define _write write
@ -1255,9 +1253,6 @@ wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
return;
}
void (*_malloc_message)(const char *p1, const char *p2, const char *p3,
const char *p4) = wrtmessage;
#include "mozilla/Assertions.h"
#include "mozilla/Attributes.h"
#include "mozilla/TaggedAnonymousMemory.h"