From: Bruno Haible <bruno@clisp.org>
Date: Thu, 7 Jul 2011 03:05:41 +0000 (+0200)
Subject: Update from gnulib.
X-Git-Tag: v0.18.2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cf0e3dd3128c56d2e9a5188e6a70d441237052d;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 4dde99930..faa63636b 100644
--- 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 80502d791..a172f2939 100644
--- 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 ';'.  */