util: simplify BSD includes

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Jan Beich <jbeich@FreeBSD.org>

diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
index 960f990636de9dcb446eb5ead915e00ed0dd4cf9..79da996a7aa5952d47dfcfa612608e9913719193 100644 (file)
--- a/src/util/u_cpu_detect.c
+++ b/src/util/u_cpu_detect.c
@@ -47,22 +47,17 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(PIPE_OS_NETBSD) || defined(PIPE_OS_OPENBSD)
+#if defined(PIPE_OS_BSD)

 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <machine/cpu.h>
 #endif
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <machine/cpu.h>
 #endif
 

-#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY)
-#include <sys/types.h>
-#include <sys/sysctl.h>
+#if defined(PIPE_OS_FREEBSD)

 #if __has_include(<sys/auxv.h>)
 #include <sys/auxv.h>
 #define HAVE_ELF_AUX_INFO
 #endif
 #if __has_include(<sys/auxv.h>)
 #include <sys/auxv.h>
 #define HAVE_ELF_AUX_INFO
 #endif

-#if defined(PIPE_ARCH_PPC)
-#include <machine/cpu.h>
-#endif

 #endif
 
 #if defined(PIPE_OS_LINUX)
 #endif
 
 #if defined(PIPE_OS_LINUX)