diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:55:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:57:05 +0200 |
| commit | b53db93006f732fb2e140137e4713dedca1700d9 (patch) | |
| tree | a2c1817c0fa6dd40d7da600148db70566e3a359d /memory/replace/logalloc/replay/Replay.cpp | |
| parent | db4b6dc1dab3dd099c93253b96fbe8089c2f9e60 (diff) | |
| parent | f7b98c15a1c0a458b4bfa420f1743c8abfbdf7a8 (diff) | |
| download | UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.gz UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.lz UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.xz UXP-b53db93006f732fb2e140137e4713dedca1700d9.zip | |
Merge branch 'malloc-rewrite'
This resolves #263.
Diffstat (limited to 'memory/replace/logalloc/replay/Replay.cpp')
| -rw-r--r-- | memory/replace/logalloc/replay/Replay.cpp | 4 |
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 |