Date: Mon, 16 Jan 2017 20:46:41 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> 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 Message-ID: <201701162046.v0GKkfV6046919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701162046.v0GKkfV6046919>