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

This commit is contained in:
Brian Behlendorf 2008-12-12 15:36:18 -08:00
commit 5134bd533c
1 changed files with 1 additions and 1 deletions

View File

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