From 228b31e1008b59b75fae17fe3e63c119c88cb17d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 15 Dec 2008 09:27:38 -0800 Subject: [PATCH 1/2] Add va_list include --- lib/libspl/include/sys/types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h index 25c3dcdd46..e59a3befd8 100644 --- a/lib/libspl/include/sys/types.h +++ b/lib/libspl/include/sys/types.h @@ -32,6 +32,7 @@ #include_next #include /* for NBBY */ #include +#include #ifndef HAVE_INTTYPES #include From 579f6e603f05dd155d59eb00a113c5a4808d9cb5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 15 Dec 2008 09:29:26 -0800 Subject: [PATCH 2/2] Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG --- lib/libzfs/include/libzfs.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/libzfs/include/libzfs.h b/lib/libzfs/include/libzfs.h index c650865f30..7bbb2c200e 100644 --- a/lib/libzfs/include/libzfs.h +++ b/lib/libzfs/include/libzfs.h @@ -521,15 +521,6 @@ extern int zfs_iscsi_perm_check(libzfs_handle_t *, char *, ucred_t *); extern int zfs_deleg_share_nfs(libzfs_handle_t *, char *, char *, void *, void *, int, zfs_share_op_t); -/* - * When dealing with nvlists, verify() is extremely useful - */ -#ifdef NDEBUG -#define verify(EX) ((void)(EX)) -#else -#define verify(EX) assert(EX) -#endif - /* * Utility function to convert a number to a human-readable form. */