diff options
| author | Jason Evans <jasone@canonware.com> | 2016-10-28 23:03:25 -0700 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-10-28 23:21:14 -0700 |
| commit | 35799a50308b5c88ba8ed41f4e48d3b619482c7d (patch) | |
| tree | e1a10d1614ec0ba66418f890c1cece8b9f7c19c8 | |
| parent | ed84764a2a6d766a74fa1df3223d69977d732510 (diff) | |
| download | jemalloc-35799a50308b5c88ba8ed41f4e48d3b619482c7d.tar.gz | |
Do not mark malloc_conf as weak for unit tests.
This is generally correct (no need for weak symbols since no jemalloc
library is involved in the link phase), and avoids linking problems
(apparently unininitialized non-NULL malloc_conf) when using cygwin with
gcc.
| -rw-r--r-- | src/jemalloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index b370f9c8..24357635 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -5,7 +5,11 @@ /* Data. */ /* Runtime configuration options. */ -const char *je_malloc_conf JEMALLOC_ATTR(weak); +const char *je_malloc_conf +#ifndef JEMALLOC_JET + JEMALLOC_ATTR(weak) +#endif + ; bool opt_abort = #ifdef JEMALLOC_DEBUG true |