diff options
author | Jason Evans <jasone@canonware.com> | 2012-05-12 00:48:33 (GMT) |
---|---|---|
committer | Jason Evans <jasone@canonware.com> | 2012-05-12 00:48:33 (GMT) |
commit | fc9b1dbf69f59d7ecfc4ac68da9847e017e1d046 (patch) | |
tree | 7f843c7c51cd5df5d3be1ca48f504325f0536c0d /src/extent.c | |
parent | fc1bb70e5f0d9a58b39efa39cc549b5af5104760 (diff) | |
parent | cbb71caceb1e53d0fd21284ce298885327c211b4 (diff) | |
download | jemalloc-fc9b1dbf69f59d7ecfc4ac68da9847e017e1d046.zip jemalloc-fc9b1dbf69f59d7ecfc4ac68da9847e017e1d046.tar.gz jemalloc-fc9b1dbf69f59d7ecfc4ac68da9847e017e1d046.tar.bz2 |
Merge branch 'dev'3.0.0
Conflicts:
ChangeLog
include/jemalloc/internal/chunk.h
src/chunk.c
src/huge.c
src/jemalloc.c
test/rallocm.c
Diffstat (limited to 'src/extent.c')
-rw-r--r-- | src/extent.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/extent.c b/src/extent.c index 3c04d3a..8c09b48 100644 --- a/src/extent.c +++ b/src/extent.c @@ -3,7 +3,6 @@ /******************************************************************************/ -#if (defined(JEMALLOC_SWAP) || defined(JEMALLOC_DSS)) static inline int extent_szad_comp(extent_node_t *a, extent_node_t *b) { @@ -25,7 +24,6 @@ extent_szad_comp(extent_node_t *a, extent_node_t *b) /* Generate red-black tree functions. */ rb_gen(, extent_tree_szad_, extent_tree_t, extent_node_t, link_szad, extent_szad_comp) -#endif static inline int extent_ad_comp(extent_node_t *a, extent_node_t *b) |