summaryrefslogtreecommitdiffstats
path: root/src/jemalloc.c
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2013-01-22 20:14:45 (GMT)
committerJason Evans <jasone@canonware.com>2013-01-22 20:14:45 (GMT)
commitba175a2bfb236d79404012d9b5bb6e9b3c8be8dd (patch)
tree213573f39ae229a9a1338f230f0d6d9ecd5664ea /src/jemalloc.c
parentae03bf6a57f0dd6a009288fa6477a300cabf6d5e (diff)
downloadjemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.zip
jemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.tar.gz
jemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.tar.bz2
Use config_* instead of JEMALLOC_*.
Convert a couple of stragglers from JEMALLOC_* to use config_*.
Diffstat (limited to 'src/jemalloc.c')
-rw-r--r--src/jemalloc.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 58e18df..2d56e4a 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -10,17 +10,8 @@ malloc_tsd_data(, thread_allocated, thread_allocated_t,
/* Runtime configuration options. */
const char *je_malloc_conf;
-#ifdef JEMALLOC_DEBUG
-bool opt_abort = true;
-# ifdef JEMALLOC_FILL
-bool opt_junk = true;
-# else
-bool opt_junk = false;
-# endif
-#else
-bool opt_abort = false;
-bool opt_junk = false;
-#endif
+bool opt_abort = config_debug;
+bool opt_junk = (config_debug && config_fill);
size_t opt_quarantine = ZU(0);
bool opt_redzone = false;
bool opt_utrace = false;