From: Roy Marples <roy@marples.name>
Date: Thu, 7 Mar 2019 15:12:27 +0000 (+0000)
Subject: Resync with upstream
X-Git-Tag: v8.0.0~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dda4b4c83447a69596729f0863477c82d544d85;p=thirdparty%2Fdhcpcd.git

Resync with upstream
---

diff --git a/compat/rbtree.h b/compat/rbtree.h
index da828fd6..b227fd70 100644
--- a/compat/rbtree.h
+++ b/compat/rbtree.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbtree.h,v 1.4 2019/03/07 12:07:42 roy Exp $	*/
+/*	$NetBSD: rbtree.h,v 1.5 2019/03/07 14:39:21 roy Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@ typedef struct rb_node {
 	 * rb_node will have an alignment of 4 or 8 bytes.
 	 */
 	uintptr_t rb_info;
-#define	RB_FLAG_POSITION	__BIT(1)
-#define	RB_FLAG_RED		__BIT(0)
+#define	RB_FLAG_POSITION	(uintptr_t)0x2
+#define	RB_FLAG_RED		(uintptr_t)0x1
 #define	RB_FLAG_MASK		(RB_FLAG_POSITION|RB_FLAG_RED)
 #define	RB_FATHER(rb) \
     ((struct rb_node *)((rb)->rb_info & ~RB_FLAG_MASK))
diff --git a/src/common.h b/src/common.h
index a1dc5217..49abd418 100644
--- a/src/common.h
+++ b/src/common.h
@@ -40,12 +40,6 @@
 #define HOSTNAME_MAX_LEN	250	/* 255 - 3 (FQDN) - 2 (DNS enc) */
 #endif
 
-#ifndef __BIT
-#define __BIT(__n)	\
-    (((uintmax_t)(__n) >= NBBY * sizeof(uintmax_t)) ? 0 : \
-    ((uintmax_t)1 << (uintmax_t)((__n) & (NBBY * sizeof(uintmax_t) - 1))))
-#endif
-
 #ifndef MIN
 #define MIN(a,b)		((/*CONSTCOND*/(a)<(b))?(a):(b))
 #define MAX(a,b)		((/*CONSTCOND*/(a)>(b))?(a):(b))