Minor verify tweak

.topdeps

@@ -1,3 +1 @@
-gcc-branch
-fix-branch
-feature-branch
+zfs-branch

.topmsg

@@ -1,19 +1,7 @@
 From: Brian Behlendorf <behlendorf1@llnl.gov>
-Subject: [PATCH] zfs branch
+Subject: [PATCH] linux context
 
-Merged result of all changes which are relevant to both Solaris
-and Linux builds of the ZFS code.  These are changes where there
-is a reasonable chance they will be accepted upstream.
-
-Additionally, since this is effectively the root of the linux
-ZFS tree the core linux build system is added here.  This
-includes autogen.sh, configure.ac, m4 macros, some scripts/*,
-and makefiles for all the core ZFS components.  Linux-only
-features which require tweaks to the build system should appear
-on the relevant topic branches.  All autotools products which
-result from autogen.sh are commited to the linux-configure-branch.
-
-This branch also contains the META, ChangeLog, AUTHORS,
-README, and GIT files.
+Minor changes to the respective user and kernel zfs_context.h
+headers to make them a little more linux friendly.  
 
 Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

lib/libzpool/include/sys/zfs_context.h

@@ -104,7 +104,7 @@ extern void vpanic(const char *, __va_list);
 #define	fm_panic	panic
 
 /* This definition is copied from assert.h. */
-#if defined(__STDC__)
+#if defined(__STDC__) && !defined(verify)
 #if __STDC_VERSION__ - 0 >= 199901L
 #define	verify(EX) (void)((EX) || \
 	(__assert_c99(#EX, __FILE__, __LINE__, __func__), 0))