# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1306704636 25200
# Node ID a8d8fc44bcc461455b86c4bcb7e5cc8dbb3b46f0
# Parent  7f850a75bbdb06975ffa19fbd414adddf2b802cb
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
--- 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
--- 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
diff --git a/modules/assert-h b/modules/assert-h
--- 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; \