diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
| commit | b427dcdda286603a06ed29b45f1090894e92074a (patch) | |
| tree | 734a0759fe9f1561a86f074396ec90d6f8011562 /src/nvim/version.c | |
| parent | 45b617afada9304cb265aad02645b22d76dfc2d5 (diff) | |
| parent | 8130eb1191aece52d8b2790302abf1bd09aaf90f (diff) | |
| download | rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.gz rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.bz2 rneovim-b427dcdda286603a06ed29b45f1090894e92074a.zip | |
Merge pull request #2465 from fwalch/fix-jemalloc
Force je_ prefix for jemalloc functions, small CMake fixes.
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 20 |
1 files changed, 12 insertions, 8 deletions
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 }; |