Rename nvpair.c to bsd_nvpair.c to not conflict with openzfs' version.

svn path=/head/; revision=362666
2020-06-27 00:55:03 +00:00 · 2020-06-27 00:55:03 +00:00 · 56e5ad5ff7 · 2020-12-20 02:59:44 +00:00
commit 56e5ad5ff7
parent 643d5ca3d6
2 changed files with 1 additions and 1 deletions
--- a/sys/conf/files
+++ b/sys/conf/files
@ -593,7 +593,7 @@ contrib/libfdt/fdt_wip.c	optional fdt
 contrib/libnv/cnvlist.c		standard
 contrib/libnv/dnvlist.c		standard
 contrib/libnv/nvlist.c		standard
-contrib/libnv/nvpair.c		standard
+contrib/libnv/bsd_nvpair.c		standard
 contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
 	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
--- a/sys/contrib/libnv/bsd_nvpair.c
+++ b/sys/contrib/libnv/bsd_nvpair.c