Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 83f807c
Avoid double define.
Vsevolod Stakhov committed 11 years ago
commit 83f807c2fe4f3a4fd174fec08dc99737f8edd204
parent 157ccf7
1 file changed +3 -3
modified external/include/tree.h
@@ -136,11 +136,11 @@
      return TREE_FIND_##node##_##field(self->field.avl_right, elm, compare);				\

  }													\

													\
- 
  struct node *TREE_MOVE_RIGHT(struct node *self, struct node *rhs)					\
+ 
  struct node *TREE_MOVE_RIGHT_##node##_##field(struct node *self, struct node *rhs)					\

  {													\

    if (!self)												\

      return rhs;											\
- 
    self->field.avl_right= TREE_MOVE_RIGHT(self->field.avl_right, rhs);					\
+ 
    self->field.avl_right= TREE_MOVE_RIGHT_##node##_##field(self->field.avl_right, rhs);					\

    return TREE_BALANCE_##node##_##field(self);								\

  }													\

													\
@@ -151,7 +151,7 @@
													\

    if (compare(elm, self) == 0)									\

      {													\
- 
	struct node *tmp= TREE_MOVE_RIGHT(self->field.avl_left, self->field.avl_right);			\
+ 
	struct node *tmp= TREE_MOVE_RIGHT_##node##_##field(self->field.avl_left, self->field.avl_right);			\

	self->field.avl_left= 0;									\

	self->field.avl_right= 0;									\

	return tmp;											\