Bug 1365473 - Rename jemalloc_types.h to mozjemalloc_types.h. r=njn
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 12 May 2017 21:52:25 +0900
changeset 394135 4a9fc3391f1c792c358f049fade6c201f53e2e7b
parent 394134 76a51cf81ac847d1773ae7350ed730db39094e9e
child 394136 19e1fbbfc10f3c9b1a295d4967ddd5eaf8bf6498
push idunknown
push userunknown
push dateunknown
reviewersnjn
bugs1365473
milestone55.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 1365473 - Rename jemalloc_types.h to mozjemalloc_types.h. r=njn
memory/build/malloc_decls.h
memory/build/mozmemory.h
memory/mozjemalloc/jemalloc_types.h
memory/mozjemalloc/moz.build
memory/mozjemalloc/mozjemalloc.cpp
memory/mozjemalloc/mozjemalloc_types.h
--- a/memory/build/malloc_decls.h
+++ b/memory/build/malloc_decls.h
@@ -8,17 +8,17 @@
  *   - function name
  *   - return type
  *   - argument types
  */
 
 #ifndef malloc_decls_h
 #  define malloc_decls_h
 
-#  include "jemalloc_types.h"
+#  include "mozjemalloc_types.h"
 
 #ifndef MALLOC_USABLE_SIZE_CONST_PTR
 #define MALLOC_USABLE_SIZE_CONST_PTR const
 #endif
 
 typedef MALLOC_USABLE_SIZE_CONST_PTR void * usable_ptr_t;
 
 #  define MALLOC_FUNCS_MALLOC 1
--- a/memory/build/mozmemory.h
+++ b/memory/build/mozmemory.h
@@ -17,17 +17,17 @@
 
 #ifndef MOZ_MEMORY
 #  error Should not include mozmemory.h when MOZ_MEMORY is not set
 #endif
 
 #include "mozmemory_wrap.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Types.h"
-#include "jemalloc_types.h"
+#include "mozjemalloc_types.h"
 
 /*
  * On OSX, malloc/malloc.h contains the declaration for malloc_good_size,
  * which will call back in jemalloc, through the zone allocator so just use it.
  */
 #ifdef XP_DARWIN
 #  include <malloc/malloc.h>
 #else
--- a/memory/mozjemalloc/moz.build
+++ b/memory/mozjemalloc/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS += [
-    'jemalloc_types.h',
+    'mozjemalloc_types.h',
 ]
 
 SOURCES += [
     'mozjemalloc.cpp',
 ]
 FINAL_LIBRARY = 'memory'
 
 # See bug 422055.
--- a/memory/mozjemalloc/mozjemalloc.cpp
+++ b/memory/mozjemalloc/mozjemalloc.cpp
@@ -294,17 +294,17 @@ typedef long ssize_t;
 #include <mach/mach_error.h>
 #include <mach/mach_init.h>
 #include <mach/vm_map.h>
 #include <malloc/malloc.h>
 #endif
 
 #endif
 
-#include "jemalloc_types.h"
+#include "mozjemalloc_types.h"
 #include "linkedlist.h"
 
 extern "C" void moz_abort();
 
 /* Some tools, such as /dev/dsp wrappers, LD_PRELOAD libraries that
  * happen to override mmap() and call dlsym() from their overridden
  * mmap(). The problem is that dlsym() calls malloc(), and this ends
  * up in a dead lock in jemalloc.
rename from memory/mozjemalloc/jemalloc_types.h
rename to memory/mozjemalloc/mozjemalloc_types.h