From owner-svn-src-projects@freebsd.org Sun Jan 15 22:01:01 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 916CACB1A44 for ; Sun, 15 Jan 2017 22:01:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6950D1120; Sun, 15 Jan 2017 22:01:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0FM10NK081180; Sun, 15 Jan 2017 22:01:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FM0xaG080448; Sun, 15 Jan 2017 22:00:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701152200.v0FM0xaG080448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 15 Jan 2017 22:00:59 +0000 (UTC) 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 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2017 22:01:01 -0000 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 /* for kqueue(2) */ -#endif #include #include #include 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 __RCSID("$NetBSD: t_proc3.c,v 1.3 2017/01/13 21:30:41 christos Exp $"); -#ifdef __FreeBSD__ -#include /* for kqueue(2) */ -#endif #include #include #include 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 /* for kqueue(2) */ -#endif #include #include #include 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 /* for kqueue(2) */ -#endif #include #include #include 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 -#endif #include #include #include 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 #ifdef __NetBSD__ #include +#else +#define DRVCTLDEV "/nonexistent" #endif #include #include #include #include -#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 #ifdef __NetBSD__ #include -#endif - -#ifdef __FreeBSD__ -#include +#else #include +#include #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 -#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 __RCSID("$NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $"); -#ifdef __FreeBSD__ -#include /* For NBBY -- it's in sys/types.h on NetBSD */ -#endif #include #include