diff options
author | James McCoy <jamessan@jamessan.com> | 2019-01-20 13:58:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-20 13:58:38 -0500 |
commit | 7e3300f7170afb870350c1d0e0a7f92f58b6e914 (patch) | |
tree | defa1b075883b6377d8162e26617a7e0571ba1b2 /src/nvim/memory.c | |
parent | 62254d2cc0d3cbd0e8aea75657ffb82e29ccfdfd (diff) | |
parent | c2343180d74f547d99abcc3c4979a9ebb047af17 (diff) | |
download | rneovim-7e3300f7170afb870350c1d0e0a7f92f58b6e914.tar.gz rneovim-7e3300f7170afb870350c1d0e0a7f92f58b6e914.tar.bz2 rneovim-7e3300f7170afb870350c1d0e0a7f92f58b6e914.zip |
Merge pull request #9526 from jamessan/remove-jemalloc
Remove support for using jemalloc instead of the system allocator
Diffstat (limited to 'src/nvim/memory.c')
-rw-r--r-- | src/nvim/memory.c | 20 |
1 files changed, 0 insertions, 20 deletions
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 |