Author: avg
Date: Thu Jan 16 12:21:21 2014
New Revision: 260703
URL: http://svnweb.freebsd.org/changeset/base/260703
Log:
zinject must use ioctl(2) compatibility wrapper
MFC after: 8 days
Sponsored by: HybridCluster
Modified:
head/cddl/contrib/opensolaris/cmd/zinject/zinject.c
head/cddl/usr.bin/zinject/Makefile
Modified: head/cddl/contrib/opensolaris/cmd/zinject/zinject.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zinject/zinject.c Thu Jan 16 11:50:00
2014 (r260702)
+++ head/cddl/contrib/opensolaris/cmd/zinject/zinject.c Thu Jan 16 12:21:21
2014 (r260703)
@@ -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 */
Modified: head/cddl/usr.bin/zinject/Makefile
==============================================================================
--- head/cddl/usr.bin/zinject/Makefile Thu Jan 16 11:50:00 2014
(r260702)
+++ head/cddl/usr.bin/zinject/Makefile Thu Jan 16 12:21:21 2014
(r260703)
@@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
