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 <sha.h> -#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 <sha256.h> -#include <sha384.h> #include <sha512.h> #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 <sys/types.h> #include <libutil.h> 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_ */ _______________________________________________ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"