* lib/verify.h (_Static_assert): For the FreeBSD workaround, use _GL_HAVE__STATIC_ASSERT, not _GL_HAVE_STATIC_ASSERT. --- ChangeLog | 6 ++++++ lib/verify.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 31e05adbd..12231d97b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-05-08 Paul Eggert <egg...@cs.ucla.edu> + + Fix _GL_HAVE__STATIC_ASSERT typo + * lib/verify.h (_Static_assert): For the FreeBSD workaround, + use _GL_HAVE__STATIC_ASSERT, not _GL_HAVE_STATIC_ASSERT. + 2019-05-05 Bruno Haible <br...@clisp.org> wcwidth: Ensure width 1, not 2, for ambiguous characters. diff --git a/lib/verify.h b/lib/verify.h index 6930645a3..eccd7e201 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -32,18 +32,18 @@ down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ #if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ - && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ && !defined __cplusplus) # define _GL_HAVE__STATIC_ASSERT 1 #endif -#if (6 <= __GNUC__) && defined __cplusplus +#if 6 <= __GNUC__ && defined __cplusplus # define _GL_HAVE_STATIC_ASSERT 1 #endif /* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other system headers, defines a conflicting _Static_assert that is no better than ours; override it. */ -#ifndef _GL_HAVE_STATIC_ASSERT +#ifndef _GL_HAVE__STATIC_ASSERT # include <stddef.h> # undef _Static_assert #endif -- 2.21.0