On 05/22/11 16:09, Bruno Haible wrote: > "verify.h" no longer defines the 'verify' macro if > <assert.h> was already included in the same compilation unit.
Thanks, I pushed this fix: verify: fix bug when gnulib <assert.h> is also included * lib/verify.h (verify, verify_true): Define if _GL_VERIFY_H is defined, not if _GL_STATIC_ASSERT_H is not defined. Perhaps there's a better way, but this fixes the immediate problem. Problem reported by Bruno Haible in <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00478.html>. diff --git a/lib/verify.h b/lib/verify.h index e5065ff..3294b30 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -204,7 +204,9 @@ template <int w> # if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert # define static_assert _Static_assert /* Draft C1X requires this #define. */ # endif -# else +# endif + +# ifdef _GL_VERIFY_H /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike
