diff options
| author | oshogbo <oshogbo@FreeBSD.org> | 2015-07-09 21:53:40 +0000 |
|---|---|---|
| committer | oshogbo <oshogbo@FreeBSD.org> | 2015-07-09 21:53:40 +0000 |
| commit | 3f0ef50892e3092893c7c05c5a22d9f1f3646a86 (patch) | |
| tree | 6d18e80adb93e6db25ed89481ed6ebafe93b62a7 /cddl | |
| parent | 6a4a0db965117b7d69bde849601dd6d2160a34e0 (diff) | |
| download | FreeBSD-src-3f0ef50892e3092893c7c05c5a22d9f1f3646a86.zip FreeBSD-src-3f0ef50892e3092893c7c05c5a22d9f1f3646a86.tar.gz | |
Rename zfs nvpair files to not colidate with our nvlist.
PR: 201356
Approved by: pjd (mentor)
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libnvpair/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 6b6f51d..98bdb47 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -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 |
