diff options
| author | Roy Marples <roy@marples.name> | 2019-03-04 16:07:05 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2019-03-04 16:07:05 +0000 |
| commit | 463091fe7c771a7617d236d3706058939af4a155 (patch) | |
| tree | e20b6961efbc096b82c8b2805cd943d45950095c /compat | |
| parent | 100d8175b2cb7f05deb97512b6017982f9e14e54 (diff) | |
| download | dhcpcd-463091fe7c771a7617d236d3706058939af4a155.tar.xz | |
Re-arrange so to reduce diff to upsteam.
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/rb.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/compat/rb.c b/compat/rb.c index 9b5491ee..3b1c3e5f 100644 --- a/compat/rb.c +++ b/compat/rb.c @@ -39,10 +39,10 @@ #else #define KASSERT(s) do { } while (/*CONSTCOND*/ 0) #endif -// __RCSID("$NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $"); +//__RCSID("$NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $"); #else #include <lib/libkern/libkern.h> -// __KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.13 2014/08/22 17:19:48 matt Exp $"); #endif #ifdef _LIBC @@ -61,22 +61,14 @@ __weak_alias(rb_tree_depths, _rb_tree_depths) #include "namespace.h" #endif -//#ifdef RBTEST +#ifdef RBTEST #include "rbtree.h" -//#else -//#include <sys/rbtree.h> -//#endif - -#if !defined(__predict_false) -#if __GNUC__ > 2 -#define __predict_true(exp) __builtin_expect((exp) != 0, 1) -#define __predict_false(exp) __builtin_expect((exp) != 0, 0) #else -#define __predict_true(exp) (exp) -#define __predict_false(exp) (exp) -#endif +#include <sys/rbtree.h> #endif +#include "common.h" + static void rb_tree_insert_rebalance(struct rb_tree *, struct rb_node *); static void rb_tree_removal_rebalance(struct rb_tree *, struct rb_node *, unsigned int); @@ -334,6 +326,10 @@ rb_tree_reparent_nodes(struct rb_tree *rbt, struct rb_node *old_father, struct rb_node * const new_father = old_child; struct rb_node * const new_child = old_father; +#if !defined(_KERNEL) && !defined(_STANDALONE) && !defined(RBDEBUG) + UNUSED(rbt); +#endif + KASSERT(which == RB_DIR_LEFT || which == RB_DIR_RIGHT); KASSERT(!RB_SENTINEL_P(old_child)); |