From 8130eb1191aece52d8b2790302abf1bd09aaf90f Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Mon, 20 Apr 2015 00:49:39 +0300
Subject: 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.
---
 src/nvim/version.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3ca0b254f4..4b4d28dcc2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -47,21 +47,25 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
 static char *features[] = {
 #ifdef HAVE_ACL
   "+acl",
-#else  // ifdef HAVE_ACL
+#else
   "-acl",
-#endif  // ifdef HAVE_ACL
+#endif
 
 #if (defined(HAVE_ICONV_H) && defined(USE_ICONV)) || defined(DYNAMIC_ICONV)
 # ifdef DYNAMIC_ICONV
   "+iconv/dyn",
-# else  // ifdef DYNAMIC_ICONV
+# else
   "+iconv",
-# endif  // ifdef DYNAMIC_ICONV
-#else  // if (defined(HAVE_ICONV_H) && defined(USE_ICONV))
-       //    ||defined(DYNAMIC_ICONV)
+# endif
+#else
   "-iconv",
-#endif  // if (defined(HAVE_ICONV_H) && defined(USE_ICONV))
-        //    || defined(DYNAMIC_ICONV)
+#endif
+
+#ifdef HAVE_JEMALLOC
+  "+jemalloc",
+#else
+  "-jemalloc",
+#endif
   NULL
 };
 
-- 
cgit