diff options
author | Christopher Ferris <cferris@google.com> | 2014-07-01 14:34:56 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2014-07-01 15:47:44 -0700 |
commit | 9ebe2acb722ad8e29179cfbff35547f607e0f532 (patch) | |
tree | 58db2f60f498f4f22bd0b21ffc10dd068ca2b248 /include/jemalloc/jemalloc.h | |
parent | 5b8106e848d99433f62310dbf3cb80ef9812e572 (diff) | |
download | jemalloc-9ebe2acb722ad8e29179cfbff35547f607e0f532.tar.gz |
Update header files from new jemalloc changes.
Also, fix gitignore, not to ignore generated headers.
Change-Id: I6c781ae85112c2098d6808adba55c0c8e05e5ecc
Diffstat (limited to 'include/jemalloc/jemalloc.h')
-rw-r--r-- | include/jemalloc/jemalloc.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h index 42b008e..da7e14f 100644 --- a/include/jemalloc/jemalloc.h +++ b/include/jemalloc/jemalloc.h @@ -24,7 +24,11 @@ extern "C" { #define JEMALLOC_USABLE_SIZE_CONST const /* sizeof(void *) == 2^LG_SIZEOF_PTR. */ +#ifdef __LP64__ +#define LG_SIZEOF_PTR 3 +#else #define LG_SIZEOF_PTR 2 +#endif /* * Name mangling for public symbols is controlled by --with-mangling and @@ -147,6 +151,9 @@ JEMALLOC_EXPORT void * je_memalign(size_t alignment, size_t size) JEMALLOC_EXPORT void * je_valloc(size_t size) JEMALLOC_ATTR(malloc); #endif +typedef void *(chunk_alloc_t)(size_t, size_t, bool *, unsigned); +typedef bool (chunk_dalloc_t)(void *, size_t, unsigned); + /* * By default application code must explicitly refer to mangled symbol names, * so that it is possible to use jemalloc in conjunction with another allocator |