summaryrefslogtreecommitdiffstats
path: root/memory/replace/logalloc
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-27 13:56:47 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-27 13:56:47 +0200
commit077c63084488ac38c1c44e8cdaa9c33086f0a649 (patch)
treec528abc8ae8570e66fecb123a9a1e821993f1f27 /memory/replace/logalloc
parentbe1786f7b0e692d8f4326dbf53e7d0689813ee2d (diff)
downloadUXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar
UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.gz
UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.lz
UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.xz
UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.zip
Remove support for making jemalloc4 the default memory allocator.
Diffstat (limited to 'memory/replace/logalloc')
-rw-r--r--memory/replace/logalloc/replay/Replay.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp
index 30fcd21e5..0ae20de2c 100644
--- a/memory/replace/logalloc/replay/Replay.cpp
+++ b/memory/replace/logalloc/replay/Replay.cpp
@@ -286,7 +286,7 @@ MOZ_BEGIN_EXTERN_C
/* mozjemalloc relies on DllMain to initialize, but DllMain is not invoked
* for executables, so manually invoke mozjemalloc initialization. */
-#if defined(_WIN32) && !defined(MOZ_JEMALLOC4)
+#if defined(_WIN32)
void malloc_init_hard(void);
#endif
@@ -475,7 +475,7 @@ main()
FdReader reader(0);
Replay replay;
-#if defined(_WIN32) && !defined(MOZ_JEMALLOC4)
+#if defined(_WIN32)
malloc_init_hard();
#endif