[src/trunk]: src/sys/external/bsd/libnv/dist fix kernel build.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d68223a7130
branches:  trunk
changeset: 433340:8d68223a7130
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Sep 08 14:32:25 2018 +0000

description:
fix kernel build.

diffstat:

 sys/external/bsd/libnv/dist/dnvlist.c |  6 +++---
 sys/external/bsd/libnv/dist/nvlist.c  |  6 +++---
 sys/external/bsd/libnv/dist/nvpair.c  |  6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diffs (95 lines):

diff -r 2facbb074259 -r 8d68223a7130 sys/external/bsd/libnv/dist/dnvlist.c
--- a/sys/external/bsd/libnv/dist/dnvlist.c     Sat Sep 08 14:13:09 2018 +0000
+++ b/sys/external/bsd/libnv/dist/dnvlist.c     Sat Sep 08 14:32:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $     */
+/*     $NetBSD: dnvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $     */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -35,7 +35,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: head/sys/contrib/libnv/dnvlist.c 328474 2018-01-27 12:58:21Z oshogbo $");
 #else
-__RCSID("$NetBSD: dnvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $");
+__RCSID("$NetBSD: dnvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $");
 #endif
 
 #if defined(_KERNEL) || defined(_STANDALONE)
@@ -46,7 +46,7 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
 #include <machine/stdarg.h>
 #endif
 
diff -r 2facbb074259 -r 8d68223a7130 sys/external/bsd/libnv/dist/nvlist.c
--- a/sys/external/bsd/libnv/dist/nvlist.c      Sat Sep 08 14:13:09 2018 +0000
+++ b/sys/external/bsd/libnv/dist/nvlist.c      Sat Sep 08 14:32:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $      */
+/*     $NetBSD: nvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $      */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -36,7 +36,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: head/sys/contrib/libnv/nvlist.c 335347 2018-06-18 22:57:32Z oshogbo $");
 #else
-__RCSID("$NetBSD: nvlist.c,v 1.3 2018/09/08 14:12:53 christos Exp $");
+__RCSID("$NetBSD: nvlist.c,v 1.4 2018/09/08 14:32:25 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -1508,7 +1508,6 @@
        nvlist_add_stringv(nvl, name, valuefmt, valueap);
        va_end(valueap);
 }
-#endif
 
 void
 nvlist_add_stringv(nvlist_t *nvl, const char *name, const char *valuefmt,
@@ -1529,6 +1528,7 @@
                (void)nvlist_move_nvpair(nvl, nvp);
        }
 }
+#endif
 
 void
 nvlist_add_null(nvlist_t *nvl, const char *name)
diff -r 2facbb074259 -r 8d68223a7130 sys/external/bsd/libnv/dist/nvpair.c
--- a/sys/external/bsd/libnv/dist/nvpair.c      Sat Sep 08 14:13:09 2018 +0000
+++ b/sys/external/bsd/libnv/dist/nvpair.c      Sat Sep 08 14:32:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvpair.c,v 1.2 2018/09/08 14:02:15 christos Exp $      */
+/*     $NetBSD: nvpair.c,v 1.3 2018/09/08 14:32:25 christos Exp $      */
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -36,7 +36,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: head/sys/contrib/libnv/nvpair.c 335382 2018-06-19 18:43:02Z lwhsu $");
 #else
-__RCSID("$NetBSD: nvpair.c,v 1.2 2018/09/08 14:02:15 christos Exp $");
+__RCSID("$NetBSD: nvpair.c,v 1.3 2018/09/08 14:32:25 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -1191,6 +1191,7 @@
        return (nvp->nvp_name);
 }
 
+#if !defined(_KERNEL) && !defined(_STANDALONE) && !defined(__NetBSD__)
 nvpair_t *
 nvpair_create_stringf(const char *name, const char *valuefmt, ...)
 {
@@ -1219,6 +1220,7 @@
                nv_free(str);
        return (nvp);
 }
+#endif
 
 nvpair_t *
 nvpair_create_null(const char *name)