From owner-svn-src-projects@freebsd.org  Mon Jan 16 20:46:42 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
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 338CCCB296A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 16 Jan 2017 20:46: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 050B11E26;
 Mon, 16 Jan 2017 20:46: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 v0GKkfHb046921;
 Mon, 16 Jan 2017 20:46:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GKkfV6046919;
 Mon, 16 Jan 2017 20:46:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701162046.v0GKkfV6046919@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 16 Jan 2017 20:46:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r312313 -
 projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib
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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2017 20:46:42 -0000

Author: ngie
Date: Mon Jan 16 20:46:40 2017
New Revision: 312313
URL: https://svnweb.freebsd.org/changeset/base/312313

Log:
  Reintroduce libutil.h #include for FreeBSD only for fparseln

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c	Mon Jan 16 20:43:30 2017	(r312312)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c	Mon Jan 16 20:46:40 2017	(r312313)
@@ -34,6 +34,13 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
+#ifdef __FreeBSD__
+/*
+ * Needed to avoid libutil.h pollution in stdio.h, which causes grief with
+ * with hexdump(3) in lib/libc/db/h_hash.c
+ */
+#include <libutil.h>
+#endif
 
 #define	WS	"\t\n "
 #define	debug	0

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c	Mon Jan 16 20:43:30 2017	(r312312)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c	Mon Jan 16 20:46:40 2017	(r312313)
@@ -36,6 +36,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#ifdef __FreeBSD__
+/*
+ * Needed to avoid libutil.h pollution in stdio.h, which causes grief with
+ * with hexdump(3) in lib/libc/db/h_hash.c
+ */
+#include <libutil.h>
+#endif
 
 #define SKIPWS(p)	while (isspace((int)(*p))) p++
 #define	WS	"\t\n "