Mercurial > hg > octave-nkf > gnulib-hg
changeset 14839:984611ea5a25
assert-h: Allow multiple gnulib generated replacements to coexist.
* lib/verify.h (struct _gl_verify_type): Avoid identical redefinition.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 29 May 2011 15:38:41 +0200 |
parents | 1d39813ecc60 |
children | 5f709022a256 |
files | ChangeLog lib/verify.h |
diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-29 Bruno Haible <bruno@clisp.org> + + assert-h: Allow multiple gnulib generated replacements to coexist. + * lib/verify.h (struct _gl_verify_type): Avoid identical redefinition. + 2011-05-29 Bruno Haible <bruno@clisp.org> argp: Allow coexistence with strerror_r-posix module.
--- a/lib/verify.h +++ b/lib/verify.h @@ -164,10 +164,13 @@ (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) # ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template <int w> struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; +# define GNULIB_defined_struct__gl_verify_type 1 +# endif # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ _gl_verify_type<(R) ? 1 : -1> # elif defined _GL_HAVE__STATIC_ASSERT