* lib/verify.h: Merge from gnulib.

diff --git a/ChangeLog b/ChangeLog
index a3c17418bd785122d5e7f6f88c8f37aa656e6dee..9f7fa0501c82cb1c4c8da9d121e8e5e2e8355107 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/verify.h: Merge from gnulib.
+
 2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/intprops.h, lib/stdint.in.h, m4/mktime.m4, m4/readlink.m4:

diff --git a/lib/verify.h b/lib/verify.h
index e5065ffa00b3eaeb75e92facfb17335421792617..3294b303505021e4491cfb83dd9dae654644214f 100644 (file)
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -204,7 +204,9 @@ template <int w>
 #  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