Date: Sun, 15 Jan 2017 22:00:59 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312243 - in projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests: kernel/kqueue lib/libc/gen lib/libc/sys Message-ID: <201701152200.v0FM0xaG080448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Jan 15 22:00:59 2017 New Revision: 312243 URL: https://svnweb.freebsd.org/changeset/base/312243 Log: Diff reduce with upstream and consolidate #ifdefs where possible Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc2.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc3.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_sig.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_vnode.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_sleep.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_mmap.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc2.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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> Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc3.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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> Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_sig.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_sig.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_sig.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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> Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_vnode.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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> Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_sleep.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_sleep.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/gen/t_sleep.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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> Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_kevent.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_kevent.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_kevent.c Sun Jan 15 22:00:59 2017 (r312243) @@ -45,16 +45,14 @@ __RCSID("$NetBSD: t_kevent.c,v 1.7 2015/ #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) { Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_mmap.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_mmap.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_mmap.c Sun Jan 15 22:00:59 2017 (r312243) @@ -75,11 +75,9 @@ __RCSID("$NetBSD: t_mmap.c,v 1.11 2017/0 #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; Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait.c Sun Jan 15 22:00:59 2017 (r312243) @@ -45,10 +45,6 @@ __RCSID("$NetBSD: t_wait.c,v 1.8 2017/01 #include <atf-c.h> -#ifdef __FreeBSD__ -#define wrusage __wrusage -#endif - ATF_TC(wait6_invalid); ATF_TC_HEAD(wait6_invalid, tc) { Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c Sun Jan 15 22:00:30 2017 (r312242) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_wait_noproc.c Sun Jan 15 22:00:59 2017 (r312243) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701152200.v0FM0xaG080448>