diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-01-12 19:48:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-01-12 19:48:30 +0000 |
| commit | 618dc75c2db5ba83b472b4b9c02204c9514df82c (patch) | |
| tree | 3726463e22e65ea96155dc0fea32d5d5908a8f49 | |
| parent | 6a23cf06e81127c6ed7a6b362ccaa391b94a1679 (diff) | |
| download | nginx-618dc75c2db5ba83b472b4b9c02204c9514df82c.tar.gz nginx-618dc75c2db5ba83b472b4b9c02204c9514df82c.zip | |
make global the rbtree color handling macros
| -rw-r--r-- | src/core/ngx_rbtree.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_rbtree.h | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c index a9d630520..0a5753cdf 100644 --- a/src/core/ngx_rbtree.c +++ b/src/core/ngx_rbtree.c @@ -13,12 +13,6 @@ * the "Introduction to Algorithms" by Cormen, Leiserson and Rivest. */ -#define ngx_rbt_red(node) ((node)->color = 1) -#define ngx_rbt_black(node) ((node)->color = 0) -#define ngx_rbt_is_red(node) ((node)->color) -#define ngx_rbt_is_black(node) (!ngx_rbt_is_red(node)) -#define ngx_rbt_copy_color(n1, n2) (n1->color = n2->color) - static ngx_inline void ngx_rbtree_left_rotate(ngx_rbtree_node_t **root, ngx_rbtree_node_t *sentinel, ngx_rbtree_node_t *node); diff --git a/src/core/ngx_rbtree.h b/src/core/ngx_rbtree.h index 16524ffc8..d7250f8ac 100644 --- a/src/core/ngx_rbtree.h +++ b/src/core/ngx_rbtree.h @@ -50,9 +50,16 @@ void ngx_rbtree_insert_timer_value(ngx_rbtree_node_t *root, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); +#define ngx_rbt_red(node) ((node)->color = 1) +#define ngx_rbt_black(node) ((node)->color = 0) +#define ngx_rbt_is_red(node) ((node)->color) +#define ngx_rbt_is_black(node) (!ngx_rbt_is_red(node)) +#define ngx_rbt_copy_color(n1, n2) (n1->color = n2->color) + + /* a sentinel must be black */ -#define ngx_rbtree_sentinel_init(node) node->color = 0 +#define ngx_rbtree_sentinel_init(node) ngx_rbt_black(node) static ngx_inline ngx_rbtree_node_t * |