Update from gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 4dde99930304b6118a80f7b8c68c34236c4765ce..faa63636b199dac0c98d3464d471a28d8a8a78b3 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * verify.h (verify_true): Deprecate.
+       (verify_expr): New macro.
+
 2011-06-03  Bruno Haible  <bruno@clisp.org>
 
        * verify.h: New file, from gnulib.

diff --git a/gettext-runtime/intl/verify.h b/gettext-runtime/intl/verify.h
index 80502d79164927cec6dea86c76b894702c67e595..a172f2939458eaf016f3b156420f215b83c02239 100644 (file)
--- a/gettext-runtime/intl/verify.h
+++ b/gettext-runtime/intl/verify.h
@@ -221,10 +221,18 @@ template <int w>
    contexts, e.g., the top level.  */
 
 /* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  */
+   Return 1.  This is equivalent to verify_expr (R, 1).
+
+   verify_true is obsolescent; please use verify_expr instead.  */
 
 # define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
 
+/* Verify requirement R at compile-time.  Return the value of the
+   expression E.  */
+
+# define verify_expr(R, E) \
+    (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
+
 /* Verify requirement R at compile-time, as a declaration without a
    trailing ';'.  */