From ad1fa9fabebf637ce57c2cd884dc4b43a0498512 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 11 Jul 2012 16:55:39 +0200
Subject: [PATCH] Bug 772423 - Hook mozjemalloc's abort(). r=jlebar

---
 memory/build/extraMallocFuncs.c | 3 +--
 memory/mozjemalloc/Makefile.in  | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/memory/build/extraMallocFuncs.c b/memory/build/extraMallocFuncs.c
index fd7b60a91723..49111c1dc17c 100644
--- a/memory/build/extraMallocFuncs.c
+++ b/memory/build/extraMallocFuncs.c
@@ -106,11 +106,10 @@ _je_malloc_message(void *cbopaque, const char *s)
 
 void (*je_malloc_message)(void *, const char *s) = _je_malloc_message;
 #endif
+#endif /* MOZ_JEMALLOC */
 
 #include <mozilla/Assertions.h>
 
 void moz_abort() {
   MOZ_CRASH();
 }
-
-#endif /* MOZ_JEMALLOC */
diff --git a/memory/mozjemalloc/Makefile.in b/memory/mozjemalloc/Makefile.in
index 844c06767fee..76e278a8e6ab 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/memory/mozjemalloc/Makefile.in
@@ -44,4 +44,6 @@ ifeq (,$(filter release esr,$(MOZ_UPDATE_CHANNEL)))
 DEFINES	+= -DMOZ_JEMALLOC_HARD_ASSERTS -DMOZ_TEMP_INVESTIGATION
 endif
 
+DEFINES += -Dabort=moz_abort
+
 include $(topsrcdir)/config/rules.mk