d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diff reduce with upstream and consolidate #ifdefs where possible

Browse Source
This commit is contained in:
Enji Cooper 2017-01-15 22:00:59 +00:00
parent 8a979e7ad7
commit 6a93de28a6
9 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/netbsd-tests/kernel/kqueue/t_proc2.c
View File

@ -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>

3
contrib/netbsd-tests/kernel/kqueue/t_proc3.c
View File

@ -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>

3
contrib/netbsd-tests/kernel/kqueue/t_sig.c
View File

@ -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>

3
contrib/netbsd-tests/kernel/kqueue/t_vnode.c
View File

@ -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>

4
contrib/netbsd-tests/lib/libc/gen/t_sleep.c
View File

@ -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>

6
contrib/netbsd-tests/lib/libc/sys/t_kevent.c
View File

@ -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)
{

6
contrib/netbsd-tests/lib/libc/sys/t_mmap.c
View File

@ -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;

4
contrib/netbsd-tests/lib/libc/sys/t_wait.c
View File

@ -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)
{

3
contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c
View File

@ -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>