diff options
| author | Jason Evans <jasone@canonware.com> | 2016-12-12 18:04:20 -0800 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-12-12 18:16:51 -0800 |
| commit | d4c5aceb7cb5c5cf7a6dfd62e072c7dd12188998 (patch) | |
| tree | 5fd6fe3a10fc41d056a9625599b9ba57669c1485 /include | |
| parent | fbe30158184c28f00f109cf4b8870c554e996bab (diff) | |
| download | platform_external_jemalloc_new-d4c5aceb7cb5c5cf7a6dfd62e072c7dd12188998.tar.gz platform_external_jemalloc_new-d4c5aceb7cb5c5cf7a6dfd62e072c7dd12188998.tar.bz2 platform_external_jemalloc_new-d4c5aceb7cb5c5cf7a6dfd62e072c7dd12188998.zip | |
Add a_type parameter to qr_{meld,split}().
Diffstat (limited to 'include')
| -rw-r--r-- | include/jemalloc/internal/extent.h | 2 | ||||
| -rw-r--r-- | include/jemalloc/internal/qr.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/jemalloc/internal/extent.h b/include/jemalloc/internal/extent.h index 3c5573ee..d5690c08 100644 --- a/include/jemalloc/internal/extent.h +++ b/include/jemalloc/internal/extent.h @@ -445,7 +445,7 @@ JEMALLOC_INLINE void extent_ring_insert(extent_t *sentinel, extent_t *extent) { - qr_meld(sentinel, extent, qr_link); + qr_meld(sentinel, extent, extent_t, qr_link); } JEMALLOC_INLINE void diff --git a/include/jemalloc/internal/qr.h b/include/jemalloc/internal/qr.h index 0fbaec25..3b5d0276 100644 --- a/include/jemalloc/internal/qr.h +++ b/include/jemalloc/internal/qr.h @@ -31,8 +31,8 @@ struct { \ (a_qrelm)->a_field.qre_next = (a_qr); \ } while (0) -#define qr_meld(a_qr_a, a_qr_b, a_field) do { \ - void *t; \ +#define qr_meld(a_qr_a, a_qr_b, a_type, a_field) do { \ + a_type *t; \ (a_qr_a)->a_field.qre_prev->a_field.qre_next = (a_qr_b); \ (a_qr_b)->a_field.qre_prev->a_field.qre_next = (a_qr_a); \ t = (a_qr_a)->a_field.qre_prev; \ @@ -44,8 +44,8 @@ struct { \ * qr_meld() and qr_split() are functionally equivalent, so there's no need to * have two copies of the code. */ -#define qr_split(a_qr_a, a_qr_b, a_field) \ - qr_meld((a_qr_a), (a_qr_b), a_field) +#define qr_split(a_qr_a, a_qr_b, a_type, a_field) \ + qr_meld((a_qr_a), (a_qr_b), a_type, a_field) #define qr_remove(a_qr, a_field) do { \ (a_qr)->a_field.qre_prev->a_field.qre_next \ |