diff options
| author | Richard Braun <rbraun@sceen.net> | 2017-09-04 22:57:42 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2017-09-04 22:57:42 +0200 |
| commit | c7efc68f95d5692d2bfdcb3ce698b28a306c74b5 (patch) | |
| tree | 3193aae1e20b4407d918b67ea1169b8cf68a4192 /kern/rbtree_i.h | |
| parent | 2f55bde818763006057337be3f95a6bc41e62433 (diff) | |
kern/rbtree: update from upstream
Diffstat (limited to 'kern/rbtree_i.h')
| -rw-r--r-- | kern/rbtree_i.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kern/rbtree_i.h b/kern/rbtree_i.h index 944148e0..973899be 100644 --- a/kern/rbtree_i.h +++ b/kern/rbtree_i.h @@ -54,7 +54,7 @@ struct rbtree { * Masks applied on the parent member of a node to obtain either the * color or the parent address. */ -#define RBTREE_COLOR_MASK ((uintptr_t)1) +#define RBTREE_COLOR_MASK ((uintptr_t)0x1) #define RBTREE_PARENT_MASK (~(uintptr_t)0x3) /* @@ -67,7 +67,7 @@ struct rbtree { * Masks applied on slots to obtain either the child index or the parent * address. */ -#define RBTREE_SLOT_INDEX_MASK ((uintptr_t)0x1) +#define RBTREE_SLOT_INDEX_MASK 0x1UL #define RBTREE_SLOT_PARENT_MASK (~RBTREE_SLOT_INDEX_MASK) /* @@ -142,7 +142,7 @@ rbtree_slot_index(rbtree_slot_t slot) * Insert a node in a tree, rebalancing it if necessary. * * The index parameter is the index in the children array of the parent where - * the new node is to be inserted. It is ignored if the parent is null. + * the new node is to be inserted. It is ignored if the parent is NULL. * * This function is intended to be used by the rbtree_insert() macro only. */ |