From: Bruno Haible Date: Sat, 30 Apr 2022 12:09:00 +0000 (+0200) Subject: string: Avoid syntax error on glibc systems with GCC 11. X-Git-Tag: v1.0~2305 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=84863a1c4dc8cca8fb0f6f670f67779cdd2d543b;p=gnulib.git string: Avoid syntax error on glibc systems with GCC 11. Reported by Tom Tromey in and by Satadru Pramanik in . * lib/string.in.h (strndup): Don't rededeclare strndup if it is defined as a macro. --- diff --git a/ChangeLog b/ChangeLog index b5e1a04986..7c7ed13141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2022-04-30 Bruno Haible + + string: Avoid syntax error on glibc systems with GCC 11. + Reported by Tom Tromey in + + and by Satadru Pramanik in + . + * lib/string.in.h (strndup): Don't rededeclare strndup if it is defined + as a macro. + 2022-04-28 Simon Marchi (tiny change) stdlib: Fix error in C++ mode on glibc systems (regr. 2022-04-13). diff --git a/lib/string.in.h b/lib/string.in.h index b6840fa912..33160b2525 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -583,7 +583,7 @@ _GL_FUNCDECL_RPL (strndup, char *, _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else -# if !@HAVE_DECL_STRNDUP@ || __GNUC__ >= 11 +# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup) _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1)) @@ -593,7 +593,7 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif _GL_CXXALIASWARN (strndup); #else -# if __GNUC__ >= 11 +# if __GNUC__ >= 11 && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n)