From 99b313868bb6a7441f762d78252ce418f5ca7fdb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 22 May 2011 18:36:04 -0700 Subject: [PATCH] verify: fix bug when gnulib 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 . --- ChangeLog | 9 +++++++++ lib/verify.h | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b35733cd1..9509b2c01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-05-22 Paul Eggert + + verify: fix bug when gnulib 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 + . + 2011-05-22 Bruno Haible xgetcwd: Simplify autoconf macro. diff --git a/lib/verify.h b/lib/verify.h index e5065ffa0..3294b3035 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -204,7 +204,9 @@ template # 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 -- 2.11.0