[master] 333a1a0c4 Eliminate an FreeBSD kernel-ism

[Poul-Henning Kamp]

commit 333a1a0c4a29bd9833faf4cf8508dd446a126b12
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Mar 23 10:17:34 2021 +0000

    Eliminate an FreeBSD kernel-ism

diff --git a/include/vtree.h b/include/vtree.h
index 298a9f72d..a0ff6ff53 100644
--- a/include/vtree.h
+++ b/include/vtree.h
@@ -333,10 +333,10 @@ struct {								\
  * that the left or right child of the tree node is "red".
  */
 #define VRBT_UP(elm, field)		(elm)->field.rbe_parent
-#define VRBT_BITS(elm, field)		(*(__uintptr_t *)&VRBT_UP(elm, field))
-#define VRBT_RED_L			((__uintptr_t)1)
-#define VRBT_RED_R			((__uintptr_t)2)
-#define VRBT_RED_MASK			((__uintptr_t)3)
+#define VRBT_BITS(elm, field)		(*(uintptr_t *)&VRBT_UP(elm, field))
+#define VRBT_RED_L			((uintptr_t)1)
+#define VRBT_RED_R			((uintptr_t)2)
+#define VRBT_RED_MASK			((uintptr_t)3)
 #define VRBT_FLIP_LEFT(elm, field)	(VRBT_BITS(elm, field) ^= VRBT_RED_L)
 #define VRBT_FLIP_RIGHT(elm, field)	(VRBT_BITS(elm, field) ^= VRBT_RED_R)
 #define VRBT_RED_LEFT(elm, field)		((VRBT_BITS(elm, field) & VRBT_RED_L) != 0)
@@ -348,7 +348,7 @@ struct {								\
 
 #define VRBT_SET_PARENT(dst, src, field) do {				\
 	VRBT_BITS(dst, field) &= VRBT_RED_MASK;				\
-	VRBT_BITS(dst, field) |= (__uintptr_t)src;			\
+	VRBT_BITS(dst, field) |= (uintptr_t)src;			\
 } while (/*CONSTCOND*/ 0)
 
 #define VRBT_SET(elm, parent, field) do {					\
diff --git a/tools/import_vtree_from_freebsd.sh b/tools/import_vtree_from_freebsd.sh
index ecc1a8435..dd8fd69c1 100644
--- a/tools/import_vtree_from_freebsd.sh
+++ b/tools/import_vtree_from_freebsd.sh
@@ -19,6 +19,7 @@ sed -E '
 485a\
 		AN(parent);			\\
 s/_SYS_TREE_H_/_VTREE_H_/
+s/__uintptr_t/uintptr_t/g
 s/SPLAY/VSPLAY/g
 s/RB_/VRBT_/g
 /(VRBT_FIND|VRBT_NFIND|VRBT_MINMAX)/{