]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
OpenBSD: Fix crash with rbtree
authorRoy Marples <roy@marples.name>
Mon, 4 Mar 2019 00:04:21 +0000 (00:04 +0000)
committerRoy Marples <roy@marples.name>
Mon, 4 Mar 2019 00:04:21 +0000 (00:04 +0000)
compat/rb.c

index b7ced7678bfb940ff9ccd99965f85268d07e73fb..2e09af585fb8190bdf47dcbf15e73cc8f4d66836 100644 (file)
@@ -67,7 +67,15 @@ __weak_alias(rb_tree_depths, _rb_tree_depths)
 //#include <sys/rbtree.h>
 //#endif
 
-#define __predict_false(tst) (tst)
+#if !defined(__predict_false)
+#if __GNUC_PREREQ__(2, 96) || defined(__lint__))
+#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
+#endif
 
 static void rb_tree_insert_rebalance(struct rb_tree *, struct rb_node *);
 static void rb_tree_removal_rebalance(struct rb_tree *, struct rb_node *,