Date: Sun, 15 Jan 2017 21:18:59 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312238 - projects/netbsd-tests-upstream-01-2017/lib/libnetbsd Message-ID: <201701152118.v0FLIxrX063817@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Jan 15 21:18:58 2017 New Revision: 312238 URL: https://svnweb.freebsd.org/changeset/base/312238 Log: libnetbsd: more portability fixes with stdio.h and util.h - stdio.h needs to pull in stdio.h/util.h for fparseln, not util.h - util.h needs to #include sys/types.h for flags_to_string, etc as flags_to_string uses u_long, which is typedef'ed in sys/types.h on FreeBSD Added: projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/stdio.h (contents, props changed) Modified: projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/util.h Added: projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/stdio.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/stdio.h Sun Jan 15 21:18:58 2017 (r312238) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2017 Dell, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LIBNETBSD_STDIO_H_ +#define _LIBNETBSD_STDIO_H_ + +#include_next <stdio.h> + +#include "util.h" + +#endif /* _SHA1_H_ */ Modified: projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/util.h ============================================================================== --- projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/util.h Sun Jan 15 20:03:13 2017 (r312237) +++ projects/netbsd-tests-upstream-01-2017/lib/libnetbsd/util.h Sun Jan 15 21:18:58 2017 (r312238) @@ -33,7 +33,7 @@ #ifndef _LIBNETBSD_UTIL_H_ #define _LIBNETBSD_UTIL_H_ -#include <stdio.h> /* for fparseln(3) */ +#include <sys/types.h> #include <libutil.h> char *flags_to_string(u_long flags, const char *def);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701152118.v0FLIxrX063817>