summaryrefslogtreecommitdiffstats
path: root/memory/build
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-27 19:16:45 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-27 19:16:45 +0200
commit43034a36e132ac4394e26cbfb4d855bd6f5114b3 (patch)
treeaee5502c6b17283b80ff2bf0706f97622df5d355 /memory/build
parent077c63084488ac38c1c44e8cdaa9c33086f0a649 (diff)
downloadUXP-43034a36e132ac4394e26cbfb4d855bd6f5114b3.tar
UXP-43034a36e132ac4394e26cbfb4d855bd6f5114b3.tar.gz
UXP-43034a36e132ac4394e26cbfb4d855bd6f5114b3.tar.lz
UXP-43034a36e132ac4394e26cbfb4d855bd6f5114b3.tar.xz
UXP-43034a36e132ac4394e26cbfb4d855bd6f5114b3.zip
Remove jemalloc 4 from our tree.
Diffstat (limited to 'memory/build')
-rw-r--r--memory/build/mozmemory_wrap.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/memory/build/mozmemory_wrap.h b/memory/build/mozmemory_wrap.h
index fd53531c1..39fc83940 100644
--- a/memory/build/mozmemory_wrap.h
+++ b/memory/build/mozmemory_wrap.h
@@ -36,8 +36,7 @@
* - jemalloc_stats
* - jemalloc_purge_freed_pages
* - jemalloc_free_dirty_pages
- * (these functions are native to mozjemalloc, and have compatibility
- * implementations for jemalloc3)
+ * (these functions are native to mozjemalloc)
*
* These functions are all exported as part of libmozglue (see
* $(topsrcdir)/mozglue/build/Makefile.in), with a few implementation
@@ -87,21 +86,16 @@
* char* strdup_impl(const char *)
* That implementation would call malloc by using "malloc_impl".
*
- * While mozjemalloc uses these "_impl" suffixed helpers, jemalloc3, being
- * third-party code, doesn't, but instead has an elaborate way to mangle
- * individual functions. See under "Run jemalloc configure script" in
- * $(topsrcdir)/configure.in.
- *
*
* When building with replace-malloc support, the above still holds, but
* the malloc implementation and jemalloc specific functions are the
* replace-malloc functions from replace_malloc.c.
*
- * The actual jemalloc/mozjemalloc implementation is prefixed with "je_".
+ * The actual mozjemalloc implementation is prefixed with "je_".
*
* Thus, when MOZ_REPLACE_MALLOC is defined, the "_impl" suffixed macros
- * expand to "je_" prefixed function when building mozjemalloc or
- * jemalloc3/mozjemalloc_compat, where MOZ_JEMALLOC_IMPL is defined.
+ * expand to "je_" prefixed function when building mozjemalloc, where
+ * MOZ_JEMALLOC_IMPL is defined.
*
* In other cases, the "_impl" suffixed macros follow the original scheme,
* except on Windows and MacOSX, where they would expand to "je_" prefixed
@@ -153,9 +147,6 @@
# endif
#endif
-/* All other jemalloc3 functions are prefixed with "je_" */
-#define je_(a) je_ ## a
-
#if !defined(MOZ_MEMORY_IMPL)
# define MOZ_MEMORY_API MFBT_API
# define MOZ_JEMALLOC_API MFBT_API