From owner-svn-src-stable@freebsd.org Tue Feb 21 07:02:53 2017 Return-Path: Delivered-To: svn-src-stable@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 199E2CE749D; Tue, 21 Feb 2017 07:02:53 +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 BE6F031C; Tue, 21 Feb 2017 07:02:52 +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 v1L72pab031378; Tue, 21 Feb 2017 07:02:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1L72pSi031375; Tue, 21 Feb 2017 07:02:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702210702.v1L72pSi031375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 21 Feb 2017 07:02:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314028 - in stable/10/lib/libnetbsd: . sys X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 07:02:53 -0000 Author: ngie Date: Tue Feb 21 07:02:51 2017 New Revision: 314028 URL: https://svnweb.freebsd.org/changeset/base/314028 Log: Revert r314020 The test build I ran unfortunately didn't catch the fact that the sha384.h compat header is missing on ^/stable/10 due to some code not being MFCed Deleted: stable/10/lib/libnetbsd/glob.h stable/10/lib/libnetbsd/pthread.h stable/10/lib/libnetbsd/sys/event.h stable/10/lib/libnetbsd/sys/types.h stable/10/lib/libnetbsd/sys/wait.h Modified: stable/10/lib/libnetbsd/sha1.h stable/10/lib/libnetbsd/sha2.h stable/10/lib/libnetbsd/util.h Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libnetbsd/sha1.h ============================================================================== --- stable/10/lib/libnetbsd/sha1.h Tue Feb 21 06:10:11 2017 (r314027) +++ stable/10/lib/libnetbsd/sha1.h Tue Feb 21 07:02:51 2017 (r314028) @@ -35,11 +35,8 @@ #include -#define SHA1_CTX SHA_CTX - #define SHA1End SHA1_End #define SHA1File SHA1_File -#define SHA1Final SHA1_Final #define SHA1Init SHA1_Init #define SHA1Update SHA1_Update Modified: stable/10/lib/libnetbsd/sha2.h ============================================================================== --- stable/10/lib/libnetbsd/sha2.h Tue Feb 21 06:10:11 2017 (r314027) +++ stable/10/lib/libnetbsd/sha2.h Tue Feb 21 07:02:51 2017 (r314028) @@ -34,7 +34,6 @@ #define _SHA2_H_ #include -#include #include #endif /* _SHA2_H_ */ Modified: stable/10/lib/libnetbsd/util.h ============================================================================== --- stable/10/lib/libnetbsd/util.h Tue Feb 21 06:10:11 2017 (r314027) +++ stable/10/lib/libnetbsd/util.h Tue Feb 21 07:02:51 2017 (r314028) @@ -30,13 +30,12 @@ * SUCH DAMAGE. */ -#ifndef _LIBNETBSD_UTIL_H_ -#define _LIBNETBSD_UTIL_H_ +#ifndef _UTIL_H_ +#define _UTIL_H_ -#include #include char *flags_to_string(u_long flags, const char *def); int string_to_flags(char **stringp, u_long *setp, u_long *clrp); -#endif +#endif /* _UTIL_H_ */