Rename zfs nvpair files to not colidate with our nvlist.
PR: 201356 Approved by: pjd (mentor)
This commit is contained in:
parent
3303004f1a
commit
306a82f8f4
@ -7,10 +7,10 @@ LIB= nvpair
|
||||
|
||||
SRCS= libnvpair.c \
|
||||
nvpair_alloc_system.c \
|
||||
nvpair_alloc_fixed.c \
|
||||
nvpair.c \
|
||||
nvpair_json.c \
|
||||
fnvpair.c
|
||||
opensolaris_fnvpair.c \
|
||||
opensolaris_nvpair.c \
|
||||
opensolaris_nvpair_alloc_fixed.c
|
||||
|
||||
WARNS?= 0
|
||||
CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
|
||||
|
@ -125,9 +125,9 @@ cddl/compat/opensolaris/kern/opensolaris_vm.c optional zfs compile-with "${ZF
|
||||
cddl/compat/opensolaris/kern/opensolaris_zone.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/acl/acl_common.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/avl/avl.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/nvpair.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/opensolaris_fnvpair.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/unicode/u8_textprep.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/zfs/zfeature_common.c optional zfs compile-with "${ZFS_C}"
|
||||
cddl/contrib/opensolaris/common/zfs/zfs_comutil.c optional zfs compile-with "${ZFS_C}"
|
||||
|
@ -13,9 +13,9 @@ SRCS+= acl_common.c
|
||||
.PATH: ${SUNW}/common/avl
|
||||
SRCS+= avl.c
|
||||
.PATH: ${SUNW}/common/nvpair
|
||||
SRCS+= nvpair.c
|
||||
SRCS+= nvpair_alloc_fixed.c
|
||||
SRCS+= fnvpair.c
|
||||
SRCS+= opensolaris_nvpair.c
|
||||
SRCS+= opensolaris_nvpair_alloc_fixed.c
|
||||
SRCS+= opensolaris_fnvpair.c
|
||||
.PATH: ${SYSDIR}/cddl/contrib/opensolaris/common/unicode
|
||||
SRCS+= u8_textprep.c
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user