summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Goldblatt <davidgoldblatt@fb.com>2017-04-25 00:16:36 (GMT)
committerDavid Goldblatt <davidtgoldblatt@gmail.com>2017-04-25 16:51:38 (GMT)
commitdab4beb277f5fd82dd0f66324bb9a2c7458afe1c (patch)
tree384a45c81fd5b802adfb4e12b7a0a9a1d393feab
parent89e2d3c12b573310e60b97beaf178007a71d83a3 (diff)
downloadjemalloc-dab4beb277f5fd82dd0f66324bb9a2c7458afe1c.zip
jemalloc-dab4beb277f5fd82dd0f66324bb9a2c7458afe1c.tar.gz
jemalloc-dab4beb277f5fd82dd0f66324bb9a2c7458afe1c.tar.bz2
Header refactoring: hash - unify and remove from catchall.
-rw-r--r--include/jemalloc/internal/hash.h (renamed from include/jemalloc/internal/hash_inlines.h)6
-rw-r--r--include/jemalloc/internal/jemalloc_internal_includes.h1
-rw-r--r--src/ckh.c1
-rw-r--r--src/prof.c1
-rw-r--r--test/unit/hash.c1
5 files changed, 6 insertions, 4 deletions
diff --git a/include/jemalloc/internal/hash_inlines.h b/include/jemalloc/internal/hash.h
index 2cd7e3e..188296c 100644
--- a/include/jemalloc/internal/hash_inlines.h
+++ b/include/jemalloc/internal/hash.h
@@ -1,5 +1,5 @@
-#ifndef JEMALLOC_INTERNAL_HASH_INLINES_H
-#define JEMALLOC_INTERNAL_HASH_INLINES_H
+#ifndef JEMALLOC_INTERNAL_HASH_H
+#define JEMALLOC_INTERNAL_HASH_H
#include "jemalloc/internal/assert.h"
@@ -315,4 +315,4 @@ hash(const void *key, size_t len, const uint32_t seed, size_t r_hash[2]) {
#endif
}
-#endif /* JEMALLOC_INTERNAL_HASH_INLINES_H */
+#endif /* JEMALLOC_INTERNAL_HASH_H */
diff --git a/include/jemalloc/internal/jemalloc_internal_includes.h b/include/jemalloc/internal/jemalloc_internal_includes.h
index 9000841..fb4105f 100644
--- a/include/jemalloc/internal/jemalloc_internal_includes.h
+++ b/include/jemalloc/internal/jemalloc_internal_includes.h
@@ -107,7 +107,6 @@
#include "jemalloc/internal/jemalloc_internal_inlines_b.h"
#include "jemalloc/internal/tcache_inlines.h"
#include "jemalloc/internal/arena_inlines_b.h"
-#include "jemalloc/internal/hash_inlines.h"
#include "jemalloc/internal/jemalloc_internal_inlines_c.h"
#include "jemalloc/internal/prof_inlines_b.h"
diff --git a/src/ckh.c b/src/ckh.c
index 8f0bac0..013b624 100644
--- a/src/ckh.c
+++ b/src/ckh.c
@@ -42,6 +42,7 @@
#include "jemalloc/internal/jemalloc_internal_includes.h"
#include "jemalloc/internal/assert.h"
+#include "jemalloc/internal/hash.h"
#include "jemalloc/internal/malloc_io.h"
#include "jemalloc/internal/prng.h"
#include "jemalloc/internal/util.h"
diff --git a/src/prof.c b/src/prof.c
index a8f6aed..a872afb 100644
--- a/src/prof.c
+++ b/src/prof.c
@@ -4,6 +4,7 @@
#include "jemalloc/internal/assert.h"
#include "jemalloc/internal/ckh.h"
+#include "jemalloc/internal/hash.h"
#include "jemalloc/internal/malloc_io.h"
/******************************************************************************/
diff --git a/test/unit/hash.c b/test/unit/hash.c
index 4850751..7cc034f 100644
--- a/test/unit/hash.c
+++ b/test/unit/hash.c
@@ -28,6 +28,7 @@
*/
#include "test/jemalloc_test.h"
+#include "jemalloc/internal/hash.h"
typedef enum {
hash_variant_x86_32,