Bug 1398965 - Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL. r=njn
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 31 Aug 2017 16:28:07 +0900
changeset 429682 7da983d6888964b480d02bce7e83dea2b54da672
parent 429681 114d87a3943b48a8cc1e9ca498bd7e7a306c95ac
child 429683 77650b2c281280c89b5407d25b56838efb886cad
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1398965
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1398965 - Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL. r=njn In practice, they mean the same thing, and there's only one place where MOZ_JEMALLOC_IMPL was used.
memory/build/mozmemory_wrap.h
memory/mozjemalloc/moz.build
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@@ -87,19 +87,16 @@
  *   char* strdup_impl(const char *)
  * That implementation would call malloc by using "malloc_impl".
  */
 
 #ifndef MOZ_MEMORY
 #  error Should only include mozmemory_wrap.h when MOZ_MEMORY is set.
 #endif
 
-#if defined(MOZ_JEMALLOC_IMPL) && !defined(MOZ_MEMORY_IMPL)
-#  define MOZ_MEMORY_IMPL
-#endif
 #if defined(MOZ_MEMORY_IMPL) && !defined(IMPL_MFBT)
 #  ifdef MFBT_API /* mozilla/Types.h was already included */
 #    error mozmemory_wrap.h has to be included before mozilla/Types.h when MOZ_MEMORY_IMPL is set and IMPL_MFBT is not.
 #  endif
 #  define IMPL_MFBT
 #endif
 
 #include "mozilla/Types.h"
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@@ -8,17 +8,17 @@ EXPORTS += [
     'mozjemalloc_types.h',
 ]
 
 SOURCES += [
     'mozjemalloc.cpp',
 ]
 FINAL_LIBRARY = 'memory'
 
-DEFINES['MOZ_JEMALLOC_IMPL'] = True
+DEFINES['MOZ_MEMORY_IMPL'] = True
 
 LOCAL_INCLUDES += [
     '/memory/build',
 ]
 
 if CONFIG['GNU_CXX']:
     # too many warnings from functions generated through rb_wrab from rb.h.
     CXXFLAGS += ['-Wno-unused-function',