From: Paul Eggert Date: Wed, 8 May 2019 19:46:27 +0000 (-0700) Subject: Fix _GL_HAVE__STATIC_ASSERT typo X-Git-Tag: v1.0~4962 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b8068cf09b6c78e35cef072efc7613049c11a632;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 31e05adbdb..12231d97b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-05-08 Paul Eggert + + 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 wcwidth: Ensure width 1, not 2, for ambiguous characters. diff --git a/lib/verify.h b/lib/verify.h index 6930645a35..eccd7e2019 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 , included by 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 # undef _Static_assert #endif