From 6a93de28a67b95982bef04718a63eb90739e31cc Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 15 Jan 2017 22:00:59 +0000
Subject: [PATCH] Diff reduce with upstream and consolidate #ifdefs where
 possible

---
 contrib/netbsd-tests/kernel/kqueue/t_proc2.c      | 3 ---
 contrib/netbsd-tests/kernel/kqueue/t_proc3.c      | 3 ---
 contrib/netbsd-tests/kernel/kqueue/t_sig.c        | 3 ---
 contrib/netbsd-tests/kernel/kqueue/t_vnode.c      | 3 ---
 contrib/netbsd-tests/lib/libc/gen/t_sleep.c       | 4 ----
 contrib/netbsd-tests/lib/libc/sys/t_kevent.c      | 6 ++----
 contrib/netbsd-tests/lib/libc/sys/t_mmap.c        | 6 ++----
 contrib/netbsd-tests/lib/libc/sys/t_wait.c        | 4 ----
 contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c | 3 ---
 9 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc2.c b/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
index 5630df7bcd6c..2d905ed740d9 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
@@ -34,9 +34,6 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
 __RCSID("$NetBSD: t_proc2.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
-#ifdef __FreeBSD__
-#include <sys/types.h> /* for kqueue(2) */
-#endif
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_proc3.c b/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
index 4822957868e4..6def4094b1bf 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
@@ -32,9 +32,6 @@
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_proc3.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
-#ifdef __FreeBSD__
-#include <sys/types.h> /* for kqueue(2) */
-#endif
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_sig.c b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
index dd6bc3e4355e..12e3d6115586 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_sig.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_sig.c
@@ -34,9 +34,6 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
 __RCSID("$NetBSD: t_sig.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
 
-#ifdef __FreeBSD__
-#include <sys/types.h> /* for kqueue(2) */
-#endif
 #include <sys/event.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
diff --git a/contrib/netbsd-tests/kernel/kqueue/t_vnode.c b/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
index abb75743071d..e87c2b2c2d6f 100644
--- a/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
+++ b/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
@@ -1,6 +1,3 @@
-#ifdef __FreeBSD__
-#include <sys/types.h> /* for kqueue(2) */
-#endif
 #include <sys/event.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_sleep.c b/contrib/netbsd-tests/lib/libc/gen/t_sleep.c
index e85867a3f4c1..d4bd2713e520 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_sleep.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_sleep.c
@@ -26,10 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef __FreeBSD__
-/* kqueue(2) on FreeBSD requires sys/types.h for uintptr_t; NetBSD doesn't. */
-#include <sys/types.h>
-#endif
 #include <sys/cdefs.h>
 #include <sys/event.h>
 #include <sys/signal.h>
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_kevent.c b/contrib/netbsd-tests/lib/libc/sys/t_kevent.c
index 8b649ca39dfc..5bddea5db746 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_kevent.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_kevent.c
@@ -45,16 +45,14 @@ __RCSID("$NetBSD: t_kevent.c,v 1.7 2015/02/05 13:55:37 isaki Exp $");
 #include <err.h>
 #ifdef __NetBSD__
 #include <sys/drvctlio.h>
+#else
+#define	DRVCTLDEV "/nonexistent"
 #endif
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 
-#ifdef __FreeBSD__
-#define	DRVCTLDEV "/nonexistent"
-#endif
-
 ATF_TC(kevent_zerotimer);
 ATF_TC_HEAD(kevent_zerotimer, tc)
 {
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_mmap.c b/contrib/netbsd-tests/lib/libc/sys/t_mmap.c
index 33adcf2e0fee..2d46448f30e1 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_mmap.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_mmap.c
@@ -75,11 +75,9 @@ __RCSID("$NetBSD: t_mmap.c,v 1.11 2017/01/13 20:43:11 christos Exp $");
 #include <paths.h>
 #ifdef __NetBSD__
 #include <machine/disklabel.h>
-#endif
-
-#ifdef __FreeBSD__
-#include <sys/disklabel.h>
+#else
 #include <stdint.h>
+#include <sys/disklabel.h>
 #endif
 
 static long	page = 0;
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_wait.c b/contrib/netbsd-tests/lib/libc/sys/t_wait.c
index 9f749cb2daae..91bbaf1f3dd1 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_wait.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_wait.c
@@ -45,10 +45,6 @@ __RCSID("$NetBSD: t_wait.c,v 1.8 2017/01/13 19:28:55 christos Exp $");
 
 #include <atf-c.h>
 
-#ifdef __FreeBSD__
-#define	wrusage	__wrusage
-#endif
-
 ATF_TC(wait6_invalid);
 ATF_TC_HEAD(wait6_invalid, tc)
 {
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c b/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c
index e5ddcbd5aa3b..c529f17e8b20 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c
@@ -29,9 +29,6 @@
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $");
 
-#ifdef __FreeBSD__
-#include <sys/param.h> /* For NBBY -- it's in sys/types.h on NetBSD */
-#endif
 #include <sys/wait.h>
 #include <sys/resource.h>