Mercurial > hg > nginx
changeset 1023:68cc5e2e1a5d
make global the rbtree color handling macros
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 12 Jan 2007 19:48:30 +0000 |
parents | 7058eb754ef0 |
children | eeadc558e86d |
files | src/core/ngx_rbtree.c src/core/ngx_rbtree.h |
diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_rbtree.c Fri Jan 12 19:26:38 2007 +0000 +++ b/src/core/ngx_rbtree.c Fri Jan 12 19:48:30 2007 +0000 @@ -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);
--- a/src/core/ngx_rbtree.h Fri Jan 12 19:26:38 2007 +0000 +++ b/src/core/ngx_rbtree.h Fri Jan 12 19:48:30 2007 +0000 @@ -50,9 +50,16 @@ 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 *