diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2022-05-05 15:36:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-05-05 15:37:40 -0700 |
| commit | 9007e10a0fc94190404c6a988f7d52d162901940 (patch) | |
| tree | bec4b170622a185f9feacde07e864f32c7ca71b2 /lib/string.in.h | |
| parent | 7e9d364b663613fd907f92de31e996463ef7d03c (diff) | |
| download | emacs-9007e10a0fc94190404c6a988f7d52d162901940.tar.gz emacs-9007e10a0fc94190404c6a988f7d52d162901940.tar.bz2 emacs-9007e10a0fc94190404c6a988f7d52d162901940.zip | |
Gnulib update via admin/merge-gnulib
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index b6840fa9121..33160b25254 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) |