diff options
| author | Jason Evans <je@fb.com> | 2013-01-23 00:54:26 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2013-01-23 00:54:26 (GMT) |
| commit | d1b6e18a99caf7e0c38707f4aed7ec8c492e0424 (patch) | |
| tree | aaa464d65624609d9bcf84f10ecfd39fbdb68523 /src/jemalloc.c | |
| parent | 2625c8968e88de435d6452e6f202c8dbdeb1775b (diff) | |
| download | jemalloc-d1b6e18a99caf7e0c38707f4aed7ec8c492e0424.zip jemalloc-d1b6e18a99caf7e0c38707f4aed7ec8c492e0424.tar.gz jemalloc-d1b6e18a99caf7e0c38707f4aed7ec8c492e0424.tar.bz2 | |
Revert opt_abort and opt_junk refactoring.
Revert refactoring of opt_abort and opt_junk declarations. clang
accepts the config_*-based declarations (and generates correct code),
but gcc complains with:
error: initializer element is not constant
Diffstat (limited to 'src/jemalloc.c')
| -rw-r--r-- | src/jemalloc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 2d56e4a..c117685 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -10,8 +10,20 @@ malloc_tsd_data(, thread_allocated, thread_allocated_t, /* Runtime configuration options. */ const char *je_malloc_conf; -bool opt_abort = config_debug; -bool opt_junk = (config_debug && config_fill); +bool opt_abort = +#ifdef JEMALLOC_DEBUG + true +#else + false +#endif + ; +bool opt_junk = +#if (defined(JEMALLOC_DEBUG) && defined(JEMALLOC_FILL)) + true +#else + false +#endif + ; size_t opt_quarantine = ZU(0); bool opt_redzone = false; bool opt_utrace = false; |