From 713c2d790d75eb897ffb4bf09b789cf8940e6ce4 Mon Sep 17 00:00:00 2001 From: mm Date: Mon, 18 Mar 2013 09:32:29 +0000 Subject: Move common zfs ioctl compatibility functions (userland) into libzfs_compat.c Introduce additional constants for zfs ioctl versions --- cddl/lib/libzfs/Makefile | 1 + cddl/lib/libzfs_core/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'cddl/lib') diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 7397cae..5b6b47d 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -18,6 +18,7 @@ SRCS= deviceid.c \ zone.c SRCS+= libzfs_changelist.c \ + libzfs_compat.c \ libzfs_config.c \ libzfs_dataset.c \ libzfs_diff.c \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index d0993689..a470fbc 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -4,12 +4,16 @@ .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs_core DPADD= ${LIBNVPAIR} LDADD= -lnvpair -SRCS= libzfs_core.c libzfs_core_compat.c +SRCS= libzfs_core.c \ + libzfs_core_compat.c + +SRCS+= libzfs_compat.c WARNS?= 0 CSTD= c99 -- cgit v1.1