aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2015-04-20 00:49:39 +0300
committerFlorian Walch <florian@fwalch.com>2015-04-29 22:26:55 +0300
commit8130eb1191aece52d8b2790302abf1bd09aaf90f (patch)
tree734a0759fe9f1561a86f074396ec90d6f8011562 /config
parent5b5d3531518ec5d3e900d3e197174990162ca3ff (diff)
downloadrneovim-8130eb1191aece52d8b2790302abf1bd09aaf90f.tar.gz
rneovim-8130eb1191aece52d8b2790302abf1bd09aaf90f.tar.bz2
rneovim-8130eb1191aece52d8b2790302abf1bd09aaf90f.zip
jemalloc: Force use of prefixed functions.
* Set JEMALLOC_NO_DEMANGLE to be able to use `je_*` functions, regardless of how jemalloc was compiled (--with-jemalloc-prefix) * Show jemalloc information in Neovim's version output. Resolve #2449.
Diffstat (limited to 'config')
-rw-r--r--config/CMakeLists.txt4
-rw-r--r--config/config.h.in5
2 files changed, 8 insertions, 1 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index ed1f422070..cdf31a8966 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -46,6 +46,10 @@ if(Iconv_FOUND)
set(HAVE_ICONV 1)
endif()
+if(JEMALLOC_FOUND)
+ set(HAVE_JEMALLOC 1)
+endif()
+
check_function_exists(lstat HAVE_LSTAT)
if(NOT HAVE_LSTAT)
# os_unix.c uses lstat.c
diff --git a/config/config.h.in b/config/config.h.in
index 9b2abfa19d..0419451e26 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -66,6 +66,9 @@
#define FEAT_BROWSE
#define FEAT_CSCOPE
#define FEAT_MOUSE
-#cmakedefine USE_JEMALLOC
+
+#ifndef UNIT_TESTING
+#cmakedefine HAVE_JEMALLOC
+#endif
#endif // AUTO_CONFIG_H