Mesa (master): util: simplify BSD includes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6ea0a918bb87076e7d7f63314929760e6bc72041
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ea0a918bb87076e7d7f63314929760e6bc72041

Author: Jan Beich <jbeich at FreeBSD.org>
Date:   Mon Sep 16 12:55:06 2019 +0000

util: simplify BSD includes

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

---

 src/util/u_cpu_detect.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
index 960f990636d..79da996a7aa 100644
--- a/src/util/u_cpu_detect.c
+++ b/src/util/u_cpu_detect.c
@@ -47,22 +47,17 @@
 #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)