[Emacs-diffs] /srv/bzr/emacs/trunk r104333: * lib/verify.h: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 104333
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-23 14:53:22 -0700
message:
  * lib/verify.h: Merge from gnulib.
modified:
  ChangeLog
  lib/verify.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-05-22 21:02:48 +0000
+++ b/ChangeLog 2011-05-23 21:53:22 +0000
@@ -1,3 +1,7 @@
+2011-05-23  Paul Eggert  <address@hidden>
+
+       * lib/verify.h: Merge from gnulib.
+
 2011-05-22  Paul Eggert  <address@hidden>
 
        * lib/intprops.h, lib/stdint.in.h, m4/mktime.m4, m4/readlink.m4:

=== modified file 'lib/verify.h'
--- a/lib/verify.h      2011-05-06 06:03:30 +0000
+++ b/lib/verify.h      2011-05-23 21:53:22 +0000
@@ -204,7 +204,9 @@
 #  if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
 #   define static_assert _Static_assert /* Draft C1X requires this #define.  */
 #  endif
-# else
+# endif
+
+# ifdef _GL_VERIFY_H
 
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike