From owner-svn-src-projects@freebsd.org Mon Jan 16 18:44:42 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 14B29CB27E4 for ; Mon, 16 Jan 2017 18:44:42 +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 CA7A21F90; Mon, 16 Jan 2017 18:44:41 +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 v0GIietZ095976; Mon, 16 Jan 2017 18:44:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GIiewh095972; Mon, 16 Jan 2017 18:44:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701161844.v0GIiewh095972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 16 Jan 2017 18:44:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312302 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread 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: Mon, 16 Jan 2017 18:44:42 -0000 Author: ngie Date: Mon Jan 16 18:44:40 2017 New Revision: 312302 URL: https://svnweb.freebsd.org/changeset/base/312302 Log: Diff reduce with upstream and prep for next set of content pushes Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_detach.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_fpu.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_once.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_sem.c Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_detach.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_detach.c Mon Jan 16 18:36:38 2017 (r312301) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_detach.c Mon Jan 16 18:44:40 2017 (r312302) @@ -39,10 +39,6 @@ __RCSID("$NetBSD: t_detach.c,v 1.2 2017/ #include "h_common.h" -#ifdef __FreeBSD__ -#include -#endif - static void *func(void *); static void * Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_fpu.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_fpu.c Mon Jan 16 18:36:38 2017 (r312301) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_fpu.c Mon Jan 16 18:44:40 2017 (r312302) @@ -60,11 +60,6 @@ __RCSID("$NetBSD: t_fpu.c,v 1.3 2017/01/ #include -#ifdef __FreeBSD__ -#include -#include -#endif - #include "h_common.h" #define N_RECURSE 10 Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_once.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_once.c Mon Jan 16 18:36:38 2017 (r312301) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_once.c Mon Jan 16 18:44:40 2017 (r312302) @@ -31,6 +31,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); __RCSID("$NetBSD: t_once.c,v 1.1 2010/07/16 15:42:53 jmmv Exp $"); +#ifdef __FreeBSD__ +#include /* For itimer*, etc. */ +#endif #include #include #include @@ -46,10 +49,6 @@ static int x; #define NTHREADS 25 -#ifdef __FreeBSD__ -#include -#endif - static void ofunc(void) { Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_sem.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_sem.c Mon Jan 16 18:36:38 2017 (r312301) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libpthread/t_sem.c Mon Jan 16 18:44:40 2017 (r312302) @@ -112,10 +112,6 @@ __RCSID("$NetBSD: t_sem.c,v 1.9 2017/01/ static sem_t sem; -#ifdef __FreeBSD__ -#include -#endif - ATF_TC(named); ATF_TC_HEAD(named, tc) {