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

2008-12-22 11:07:38 -08:00 · 2008-12-22 11:07:38 -08:00 · 03a0383581
parent 88251643d7 3c7b37a02c
commit 03a0383581
1 changed files with 0 additions and 1 deletions
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@ -52,7 +52,6 @@
 #include <sys/zfs_fuid.h>
 #include <sys/arc.h>
 #undef ZFS_MAXNAMELEN
-#undef verify
 #include <libzfs.h>

 const char cmdname[] = "zdb";