From ac35c9f7820b7f3b791b2c172eaa434836be311d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 15:35:12 -0800 Subject: [PATCH] Minor verify tweak --- .topdeps | 4 +--- .topmsg | 18 +++--------------- lib/libzpool/include/sys/zfs_context.h | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.topdeps b/.topdeps index 607c231780..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1 @@ -gcc-branch -fix-branch -feature-branch +zfs-branch diff --git a/.topmsg b/.topmsg index e9722e1075..ae6353a938 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,7 @@ From: Brian Behlendorf -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 diff --git a/lib/libzpool/include/sys/zfs_context.h b/lib/libzpool/include/sys/zfs_context.h index f924dd1a64..36159c42a3 100644 --- a/lib/libzpool/include/sys/zfs_context.h +++ b/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))