diff options
| author | Richard Braun <rbraun@sceen.net> | 2017-01-13 00:16:09 +0100 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2017-01-13 00:16:09 +0100 |
| commit | cf59c5fa63b4639777fbe28fba79cfbd63fa6d4e (patch) | |
| tree | 6cd4b64fc94f7cc9c2c1f75ba298169a88248657 /kern/rbtree.c | |
| parent | 27e9a04a0a07707d7a85dc65198b4ab8f32888f6 (diff) | |
Replace unsigned long with uintptr_t for integer/pointer conversions
This is mostly done for the machine-independent part.
Diffstat (limited to 'kern/rbtree.c')
| -rw-r--r-- | kern/rbtree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kern/rbtree.c b/kern/rbtree.c index 49cb097..0d0a844 100644 --- a/kern/rbtree.c +++ b/kern/rbtree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012 Richard Braun. + * Copyright (c) 2010-2017 Richard Braun. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ #include <kern/rbtree.h> #include <kern/rbtree_i.h> #include <kern/stddef.h> +#include <kern/stdint.h> /* * Return the index of a node in the children array of its parent. @@ -79,7 +80,7 @@ rbtree_node_set_parent(struct rbtree_node *node, struct rbtree_node *parent) assert(rbtree_node_check_alignment(node)); assert(rbtree_node_check_alignment(parent)); - node->parent = (unsigned long)parent | (node->parent & RBTREE_COLOR_MASK); + node->parent = (uintptr_t)parent | (node->parent & RBTREE_COLOR_MASK); } /* @@ -179,7 +180,7 @@ rbtree_insert_rebalance(struct rbtree *tree, struct rbtree_node *parent, assert(rbtree_node_check_alignment(parent)); assert(rbtree_node_check_alignment(node)); - node->parent = (unsigned long)parent | RBTREE_COLOR_RED; + node->parent = (uintptr_t)parent | RBTREE_COLOR_RED; node->children[RBTREE_LEFT] = NULL; node->children[RBTREE_RIGHT] = NULL; |