From 54373be0840881cb1123a190013dd11c34ab62f1 Mon Sep 17 00:00:00 2001 From: David Goldblatt Date: Tue, 11 Apr 2017 13:06:31 -0700 Subject: Header refactoring: move malloc_io.h out of the catchall --- include/jemalloc/internal/ctl_externs.h | 2 ++ include/jemalloc/internal/jemalloc_internal_includes.h | 1 - src/ckh.c | 2 ++ src/jemalloc.c | 1 + src/malloc_io.c | 1 + src/mutex.c | 2 ++ src/pages.c | 2 ++ src/prof.c | 2 ++ src/witness.c | 2 ++ 9 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/jemalloc/internal/ctl_externs.h b/include/jemalloc/internal/ctl_externs.h index 17bbba0..875a810 100644 --- a/include/jemalloc/internal/ctl_externs.h +++ b/include/jemalloc/internal/ctl_externs.h @@ -1,6 +1,8 @@ #ifndef JEMALLOC_INTERNAL_CTL_EXTERNS_H #define JEMALLOC_INTERNAL_CTL_EXTERNS_H +#include "jemalloc/internal/malloc_io.h" + /* Maximum ctl tree depth. */ #define CTL_MAX_DEPTH 7 diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h index 64cda53..d4d0c20 100644 --- a/include/jemalloc/internal/jemalloc_internal_includes.h +++ b/include/jemalloc/internal/jemalloc_internal_includes.h @@ -41,7 +41,6 @@ /******************************************************************************/ #include "jemalloc/internal/assert.h" -#include "jemalloc/internal/malloc_io.h" #include "jemalloc/internal/util.h" /******************************************************************************/ diff --git a/src/ckh.c b/src/ckh.c index a359a5c..a9d181b 100644 --- a/src/ckh.c +++ b/src/ckh.c @@ -38,6 +38,8 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" + /******************************************************************************/ /* Function prototypes for non-inline static functions. */ diff --git a/src/jemalloc.c b/src/jemalloc.c index 4c38517..4b4e943 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -3,6 +3,7 @@ #include "jemalloc/internal/jemalloc_internal_includes.h" #include "jemalloc/internal/atomic.h" +#include "jemalloc/internal/malloc_io.h" /******************************************************************************/ /* Data. */ diff --git a/src/malloc_io.c b/src/malloc_io.c index 98ef7a6..11dc68d 100644 --- a/src/malloc_io.c +++ b/src/malloc_io.c @@ -1,6 +1,7 @@ #define JEMALLOC_MALLOC_IO_C_ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" #ifdef assert # undef assert diff --git a/src/mutex.c b/src/mutex.c index 26af523..92c23da 100644 --- a/src/mutex.c +++ b/src/mutex.c @@ -2,6 +2,8 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" + #if defined(JEMALLOC_LAZY_LOCK) && !defined(_WIN32) #include #endif diff --git a/src/pages.c b/src/pages.c index 53ca653..f113823 100644 --- a/src/pages.c +++ b/src/pages.c @@ -2,6 +2,8 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" + #ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT #include #endif diff --git a/src/prof.c b/src/prof.c index 334466b..276ca36 100644 --- a/src/prof.c +++ b/src/prof.c @@ -2,6 +2,8 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" + /******************************************************************************/ #ifdef JEMALLOC_PROF_LIBUNWIND diff --git a/src/witness.c b/src/witness.c index 26b16e7..bd04082 100644 --- a/src/witness.c +++ b/src/witness.c @@ -2,6 +2,8 @@ #include "jemalloc/internal/jemalloc_preamble.h" #include "jemalloc/internal/jemalloc_internal_includes.h" +#include "jemalloc/internal/malloc_io.h" + void witness_init(witness_t *witness, const char *name, witness_rank_t rank, witness_comp_t *comp, void *opaque) { -- cgit v0.12