From eec0029f966ca194862bbcec3b1b8b8de701fd24 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sun, 15 Jan 2017 21:18:58 +0000
Subject: [PATCH] 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
---
 lib/libnetbsd/stdio.h | 37 +++++++++++++++++++++++++++++++++++++
 lib/libnetbsd/util.h  |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 lib/libnetbsd/stdio.h

diff --git a/lib/libnetbsd/stdio.h b/lib/libnetbsd/stdio.h
new file mode 100644
index 000000000000..ccd97cd7c8a0
--- /dev/null
+++ b/lib/libnetbsd/stdio.h
@@ -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_ */
diff --git a/lib/libnetbsd/util.h b/lib/libnetbsd/util.h
index a2e59b0ed52e..5cb017cebe3b 100644
--- a/lib/libnetbsd/util.h
+++ b/lib/libnetbsd/util.h
@@ -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);