svn commit: r289107 - stable/10/sys/sys

[Konstantin Belousov]

Author: kib
Date: Sat Oct 10 05:50:42 2015
New Revision: 289107
URL: https://svnweb.freebsd.org/changeset/base/289107

Log:
  MFC r288258:
  Make the __bitcount*() functions unconditionally available.

Modified:
  stable/10/sys/sys/types.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/types.h
==============================================================================
--- stable/10/sys/sys/types.h	Sat Oct 10 05:00:18 2015	(r289106)
+++ stable/10/sys/sys/types.h	Sat Oct 10 05:50:42 2015	(r289107)
@@ -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