diff options
Diffstat (limited to 'src/nvim')
-rw-r--r-- | src/nvim/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/nvim/memory.c | 20 | ||||
-rw-r--r-- | src/nvim/version.c | 6 |
3 files changed, 0 insertions, 31 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index a2c4e677d4..928d473b04 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -397,11 +397,6 @@ endif() set(NVIM_EXEC_LINK_LIBRARIES ${NVIM_LINK_LIBRARIES} ${LUA_PREFERRED_LIBRARIES}) -# Don't use jemalloc in the unit test library. -if(JEMALLOC_FOUND) - list(APPEND NVIM_EXEC_LINK_LIBRARIES ${JEMALLOC_LIBRARIES}) -endif() - if(POLICY CMP0069) cmake_policy(SET CMP0069 NEW) endif() diff --git a/src/nvim/memory.c b/src/nvim/memory.c index d38079ca72..b49b521bc9 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -18,35 +18,15 @@ #include "nvim/ui.h" #include "nvim/api/vim.h" -#ifdef HAVE_JEMALLOC -// Force je_ prefix on jemalloc functions. -# define JEMALLOC_NO_DEMANGLE -# include <jemalloc/jemalloc.h> -#endif - #ifdef UNIT_TESTING # define malloc(size) mem_malloc(size) # define calloc(count, size) mem_calloc(count, size) # define realloc(ptr, size) mem_realloc(ptr, size) # define free(ptr) mem_free(ptr) -# ifdef HAVE_JEMALLOC -MemMalloc mem_malloc = &je_malloc; -MemFree mem_free = &je_free; -MemCalloc mem_calloc = &je_calloc; -MemRealloc mem_realloc = &je_realloc; -# else MemMalloc mem_malloc = &malloc; MemFree mem_free = &free; MemCalloc mem_calloc = &calloc; MemRealloc mem_realloc = &realloc; -# endif -#else -# ifdef HAVE_JEMALLOC -# define malloc(size) je_malloc(size) -# define calloc(count, size) je_calloc(count, size) -# define realloc(ptr, size) je_realloc(ptr, size) -# define free(ptr) je_free(ptr) -# endif #endif #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/version.c b/src/nvim/version.c index 20b71ab724..b7c9140b7f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -62,12 +62,6 @@ static char *features[] = { "-iconv", #endif -#ifdef HAVE_JEMALLOC -"+jemalloc", -#else -"-jemalloc", -#endif - #ifdef FEAT_TUI "+tui", #else |