summaryrefslogtreecommitdiffstats
path: root/include/jemalloc
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2017-01-17 06:54:36 (GMT)
committerJason Evans <jasone@canonware.com>2017-01-18 04:13:28 (GMT)
commit0f7376eb6295fcd751956cb3df248e838eea003f (patch)
treea5238d105c03b63c9e94175f7a3d452f08d6cdf1 /include/jemalloc
parent1ff09534b58957a6f23b1711d986f79f070f2b06 (diff)
downloadjemalloc-0f7376eb6295fcd751956cb3df248e838eea003f.zip
jemalloc-0f7376eb6295fcd751956cb3df248e838eea003f.tar.gz
jemalloc-0f7376eb6295fcd751956cb3df248e838eea003f.tar.bz2
Don't rely on OSX SDK malloc/malloc.h for malloc_zone struct definitions
The SDK jemalloc is built against might be not be the latest for various reasons, but the resulting binary ought to work on newer versions of OSX. In order to ensure this, we need the fullest definitions possible, so copy what we need from the latest version of malloc/malloc.h available on opensource.apple.com.
Diffstat (limited to 'include/jemalloc')
-rw-r--r--include/jemalloc/internal/jemalloc_internal.h.in1
-rw-r--r--include/jemalloc/internal/jemalloc_internal_defs.h.in1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index 00dce68..dc9df35 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -162,7 +162,6 @@ static const bool have_thp =
#include <mach/mach_error.h>
#include <mach/mach_init.h>
#include <mach/vm_map.h>
-#include <malloc/malloc.h>
#endif
#include "jemalloc/internal/ph.h"
diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h.in b/include/jemalloc/internal/jemalloc_internal_defs.h.in
index 722c41d..c777ab0 100644
--- a/include/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/include/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -243,7 +243,6 @@
* Darwin (OS X) uses zones to work around Mach-O symbol override shortcomings.
*/
#undef JEMALLOC_ZONE
-#undef JEMALLOC_ZONE_VERSION
/*
* Methods for determining whether the OS overcommits.