assert-h: work around 'verify' incompatibility

* lib/verify.h: Use @...@ directives, not ifdef.
* modules/assert-h (assert.h): Implement the directives.

diff --git a/ChangeLog b/ChangeLog
index 8bcf08756f0253c2f701db8f5698c6083a320181..bd060c737f28542bc86d846071821c60ba85a36d 100644 (file)
--- 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

diff --git a/lib/verify.h b/lib/verify.h
index 760486072ec99639d3fce06dc713d7682ae9cae9..c6d30a35af9356f8af4b20fcfc47cf7c48532f1f 100644 (file)
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -209,7 +209,7 @@ template <int w>
 #  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 @@ template <int w>
 /* 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

diff --git a/modules/assert-h b/modules/assert-h
index 595fefe1e29003247c5b536db849031196e9cd13..f7eb48244e693d900ed73b32f99e1755a362ccf1 100644 (file)
--- a/modules/assert-h
+++ b/modules/assert-h
@@ -27,6 +27,7 @@ assert.h: assert.in.h verify.h $(top_builddir)/config.status
              -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; \