Bug 1367695 - Remove leftovers from jemalloc4. r?njn draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 25 May 2017 16:24:13 +0900
changeset 584329 64fa15db5143da994d512bfbf060325cfb95b8bb
parent 584220 45f41aff3fe6b68d2b80eaf49fd14f1be52a5e03
child 630337 184275ffc4fdb0ce2809778eaa9a05930a058c35
push id60693
push userbmo:mh+mozilla@glandium.org
push dateThu, 25 May 2017 08:56:49 +0000
reviewersnjn
bugs1367695
milestone55.0a1
Bug 1367695 - Remove leftovers from jemalloc4. r?njn MOZ_REPLACE_JEMALLOC was only defined when building jemalloc4 as a replace-malloc library.
memory/build/mozmemory_wrap.h
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@@ -124,26 +124,22 @@
 #ifdef __cplusplus
 #define MOZ_EXTERN_C extern "C"
 #else
 #define MOZ_EXTERN_C
 #endif
 #endif
 
 #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 MOZ_EXTERN_C MFBT_API
-#    ifdef MOZ_REPLACE_JEMALLOC
-#      define MOZ_MEMORY_API MOZ_EXTERN_C 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
 #        define mozmem_malloc_impl(a)   je_ ## a
 #      endif
 #    else
 #      define MOZ_MEMORY_API MOZ_EXTERN_C MFBT_API
 #      if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)