Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
This commit is contained in:
commit
720f34ffbe
|
@ -25,8 +25,6 @@
|
||||||
|
|
||||||
#include <libzfs.h>
|
#include <libzfs.h>
|
||||||
|
|
||||||
#undef verify /* both libzfs.h and zfs_context.h want to define this */
|
|
||||||
|
|
||||||
#include <sys/zfs_context.h>
|
#include <sys/zfs_context.h>
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
Loading…
Reference in New Issue