diff options
author | Richard Braun <rbraun@sceen.net> | 2017-01-12 21:10:54 +0100 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2017-01-12 21:12:18 +0100 |
commit | bd875458fcb4aa5516996ffb128b601a89bd25af (patch) | |
tree | 3526e12306c00b0b5614719ee795d2a526539652 /rbtree.c | |
parent | b4ea88ef4530f450ce2b44c2f09c510f2bea0f9b (diff) |
Replace unsigned long with uintptr_t for integer/pointer conversions
Diffstat (limited to 'rbtree.c')
-rw-r--r-- | rbtree.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2015 Richard Braun. + * Copyright (c) 2010-2017 Richard Braun. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,6 +29,7 @@ #include <assert.h> #include <stddef.h> +#include <stdint.h> #include "macros.h" #include "rbtree.h" @@ -92,7 +93,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); } /* @@ -192,7 +193,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; |