summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2014-02-17 17:46:15 +0000
committeravg <avg@FreeBSD.org>2014-02-17 17:46:15 +0000
commite67db98e946305174857d851ca62d8349077b2d2 (patch)
tree7f9f46a173a58bf34b6cbe41ac962fd9f023d160 /cddl
parent1aeb2280bb8ddd37239a0fbf4b326ac0c1c015ec (diff)
downloadFreeBSD-src-e67db98e946305174857d851ca62d8349077b2d2.zip
FreeBSD-src-e67db98e946305174857d851ca62d8349077b2d2.tar.gz
MFC r260703: zinject must use ioctl(2) compatibility wrapper
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zinject/zinject.c1
-rw-r--r--cddl/usr.bin/zinject/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zinject/zinject.c b/cddl/contrib/opensolaris/cmd/zinject/zinject.c
index 994d687..ddcdb1f 100644
--- a/cddl/contrib/opensolaris/cmd/zinject/zinject.c
+++ b/cddl/contrib/opensolaris/cmd/zinject/zinject.c
@@ -148,6 +148,7 @@
#include <sys/mount.h>
#include <libzfs.h>
+#include <libzfs_compat.h>
#undef verify /* both libzfs.h and zfs_context.h want to define this */
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index 8c5c141..5625149 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
OpenPOWER on IntegriCloud