From c51894a182c11e94331debf51f3eebac815d32b0 Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Sat, 10 Oct 2015 05:50:42 +0000
Subject: MFC r288258: Make the __bitcount*() functions unconditionally
 available.

---
 sys/sys/types.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sys/sys')

diff --git a/sys/sys/types.h b/sys/sys/types.h
index b6c4c89..24ba55e 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -285,9 +285,6 @@ typedef	_Bool	bool;
  * The following are all things that really shouldn't exist in this header,
  * since its purpose is to provide typedefs, not miscellaneous doodads.
  */
-#if __BSD_VISIBLE
-
-#include <sys/select.h>
 
 #ifdef __POPCNT__
 #define	__bitcount64(x)	__builtin_popcountll((__uint64_t)(x))
@@ -351,6 +348,10 @@ __bitcount64(__uint64_t _x)
 #define	__bitcount(x)	__bitcount32((unsigned int)(x))
 #endif
 
+#if __BSD_VISIBLE
+
+#include <sys/select.h>
+
 /*
  * minor() gives a cookie instead of an index since we don't want to
  * change the meanings of bits 0-15 or waste time and space shifting
-- 
cgit v1.1