Merge branch 'fix-branch' into refs/top-bases/zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 15:51:14 -08:00
commit d56b3c2440
1 changed files with 0 additions and 2 deletions

View File

@ -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>