diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/verify.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a3c17418bd7..9f7fa0501c8 100644 --- 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 e5065ffa00b..3294b303505 100644 --- 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 |