util: simplify BSD includes
authorJan Beich <jbeich@FreeBSD.org>
Mon, 16 Sep 2019 12:55:06 +0000 (12:55 +0000)
committerMatt Turner <mattst88@gmail.com>
Wed, 9 Oct 2019 19:55:15 +0000 (12:55 -0700)
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
src/util/u_cpu_detect.c

index 960f990636de9dcb446eb5ead915e00ed0dd4cf9..79da996a7aa5952d47dfcfa612608e9913719193 100644 (file)
 #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
 
-#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 defined(PIPE_ARCH_PPC)
-#include <machine/cpu.h>
-#endif
 #endif
 
 #if defined(PIPE_OS_LINUX)