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

2008-12-22 15:51:14 -08:00 · 2008-12-22 15:51:14 -08:00 · 720f34ffbe
parent 67a52f2701 d56b3c2440
commit 720f34ffbe
1 changed files with 0 additions and 2 deletions
--- a/cmd/zinject/translate.c
+++ b/cmd/zinject/translate.c
@ -25,8 +25,6 @@

 #include <libzfs.h>

-#undef verify	/* both libzfs.h and zfs_context.h want to define this */
-
 #include <sys/zfs_context.h>

 #include <errno.h>