Bug 1398965 - Remove MOZ_JEMALLOC_IMPL in favor of MOZ_MEMORY_IMPL. r?njn draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 31 Aug 2017 16:28:07 +0900
changeset 662795 91b6954443bff535383f8d3abbb07927d0ff214f
parent 662794 114d87a3943b48a8cc1e9ca498bd7e7a306c95ac
child 662796 065721f5703fd5b1dfe593e988ec448661459ebf
child 662797 575d870c0f2acdde5d60c08556abc8b261cef979
push id79191
push userbmo:mh+mozilla@glandium.org
push dateTue, 12 Sep 2017 04:11:54 +0000
reviewersnjn
bugs1398965
milestone57.0a1
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',