Mercurial > hg > octave-lyh > gnulib-hg
changeset 14846:a8d8fc44bcc4
assert-h: work around 'verify' incompatibility
* lib/verify.h: Use @...@ directives, not ifdef.
* modules/assert-h (assert.h): Implement the directives.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 29 May 2011 14:30:36 -0700 |
| parents | 7f850a75bbdb |
| children | 5afc11b3902a |
| files | ChangeLog lib/verify.h modules/assert-h |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-29 Paul Eggert <eggert@cs.ucla.edu> + + assert-h: work around 'verify' incompatibility + * lib/verify.h: Use @...@ directives, not ifdef. + * modules/assert-h (assert.h): Implement the directives. + 2011-05-29 Jim Meyering <meyering@redhat.com> trim: remove three superfluous assignments
--- a/lib/verify.h +++ b/lib/verify.h @@ -209,7 +209,7 @@ # endif # endif -# ifdef _GL_VERIFY_H +/* @assert.h omit start@ */ /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -223,13 +223,13 @@ /* Verify requirement R at compile-time, as an integer constant expression. Return 1. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +# define verify(R) _GL_VERIFY (R, "verify (" #R ")") -# endif +/* @assert.h omit end@ */ #endif
--- a/modules/assert-h +++ b/modules/assert-h @@ -27,6 +27,7 @@ -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ < $(srcdir)/assert.in.h && \ sed -e 's|_GL_VERIFY_H|_${gl_include_guard_prefix}_STATIC_ASSERT_H|g' \ + -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ -e 's|_gl_verify|_gl_static_assert|g' \ -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ < $(srcdir)/verify.h; \