summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2016-10-28 23:59:42 -0700
committerJason Evans <jasone@canonware.com>2016-10-29 00:16:30 -0700
commite46f8f97bc4dc3298e1d3b452ee69616fdbcd43e (patch)
treea6b83b8869a883f38d3b694978551be3d9d5415e
parent35799a50308b5c88ba8ed41f4e48d3b619482c7d (diff)
downloadjemalloc-e46f8f97bc4dc3298e1d3b452ee69616fdbcd43e.tar.gz
Do not mark malloc_conf as weak on Windows.
This works around malloc_conf not being properly initialized by at least the cygwin toolchain. Prior build system changes to use -Wl,--[no-]whole-archive may be necessary for malloc_conf resolution to work properly as a non-weak symbol (not tested).
-rw-r--r--src/jemalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 24357635..8210086d 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -6,7 +6,7 @@
/* Runtime configuration options. */
const char *je_malloc_conf
-#ifndef JEMALLOC_JET
+#ifndef _WIN32
JEMALLOC_ATTR(weak)
#endif
;