summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-27 20:23:28 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-27 20:23:28 +0200
commit9c0786757348a5b109bac8f3d04472357aa18b11 (patch)
tree726806c43a2e4bd4cceb76d57b357d4f75b2eaed
parent43034a36e132ac4394e26cbfb4d855bd6f5114b3 (diff)
downloadUXP-9c0786757348a5b109bac8f3d04472357aa18b11.tar
UXP-9c0786757348a5b109bac8f3d04472357aa18b11.tar.gz
UXP-9c0786757348a5b109bac8f3d04472357aa18b11.tar.lz
UXP-9c0786757348a5b109bac8f3d04472357aa18b11.tar.xz
UXP-9c0786757348a5b109bac8f3d04472357aa18b11.zip
Remove MOZ_REPLACE_JEMALLOC
This was only defined when building jemalloc4 as a replace-malloc library.
-rw-r--r--memory/build/mozmemory_wrap.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h
index 39fc83940..5d718e75e 100644
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@@ -120,16 +120,12 @@
#include "mozilla/Types.h"
#ifdef MOZ_MEMORY_IMPL
-# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC) && !defined(MOZ_REPLACE_JEMALLOC)
+# if defined(MOZ_JEMALLOC_IMPL) && defined(MOZ_REPLACE_MALLOC)
# define mozmem_malloc_impl(a) je_ ## a
# define mozmem_jemalloc_impl(a) je_ ## a
# else
# define MOZ_JEMALLOC_API MFBT_API
-# ifdef MOZ_REPLACE_JEMALLOC
-# define MOZ_MEMORY_API MFBT_API
-# define mozmem_malloc_impl(a) replace_ ## a
-# define mozmem_jemalloc_impl(a) replace_ ## a
-# elif (defined(XP_WIN) || defined(XP_DARWIN))
+# if (defined(XP_WIN) || defined(XP_DARWIN))
# if defined(MOZ_REPLACE_MALLOC)
# define mozmem_malloc_impl(a) a ## _impl
# else