aboutsummaryrefslogtreecommitdiffstats
path: root/lib/string.in.h
diff options
context:
space:
mode:
authorPaul Eggert2020-05-11 17:28:23 -0700
committerPaul Eggert2020-05-11 17:54:23 -0700
commit00f0ad55cd7cbb71e42de0d52b7607ffb6a3c220 (patch)
treec7ea55a573abdb8a1583d59ca38ef035e33978f7 /lib/string.in.h
parentdd0b910f1a9d08e65f59cc7ebc10fb6cd0fecfc9 (diff)
downloademacs-00f0ad55cd7cbb71e42de0d52b7607ffb6a3c220.tar.gz
emacs-00f0ad55cd7cbb71e42de0d52b7607ffb6a3c220.zip
Update from gnulib
This incorporates: 2020-05-11 careadlinkat: fix GCC 10 workaround 2020-05-10 careadlinkat: limit GCC workaround 2020-05-10 attribute: clarify list of attributes 2020-05-10 string: fix compilation error in C++ mode 2020-05-09 manywarnings: port to GCC 10.1 2020-05-09 careadlinkat: pacify -Wreturn-local-addr 2020-05-09 attribute: remove ATTRIBUTE_DEPRECATED 2020-05-09 attribute: Add comments * lib/attribute.h, lib/careadlinkat.c, lib/string.in.h: * lib/warn-on-use.h, m4/manywarnings.m4: Copy from Gnulib.
Diffstat (limited to 'lib/string.in.h')
-rw-r--r--lib/string.in.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/lib/string.in.h b/lib/string.in.h
index 96e132f37d7..a08e7057fbd 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -334,9 +334,10 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
334 GB18030 and the character to be searched is a digit. */ 334 GB18030 and the character to be searched is a digit. */
335# undef strchr 335# undef strchr
336/* Assume strchr is always declared. */ 336/* Assume strchr is always declared. */
337_GL_WARN_ON_USE (strchr, "strchr cannot work correctly on character strings " 337_GL_WARN_ON_USE_CXX (strchr, const char *, (const char *, int),
338 "in some multibyte locales - " 338 "strchr cannot work correctly on character strings "
339 "use mbschr if you care about internationalization"); 339 "in some multibyte locales - "
340 "use mbschr if you care about internationalization");
340#endif 341#endif
341 342
342/* Find the first occurrence of C in S or the final NUL byte. */ 343/* Find the first occurrence of C in S or the final NUL byte. */
@@ -528,15 +529,17 @@ _GL_CXXALIASWARN (strpbrk);
528 locale encoding is GB18030 and one of the characters to be searched is a 529 locale encoding is GB18030 and one of the characters to be searched is a
529 digit. */ 530 digit. */
530# undef strpbrk 531# undef strpbrk
531_GL_WARN_ON_USE (strpbrk, "strpbrk cannot work correctly on character strings " 532_GL_WARN_ON_USE_CXX (strpbrk, const char *, (const char *, const char *),
532 "in multibyte locales - " 533 "strpbrk cannot work correctly on character strings "
533 "use mbspbrk if you care about internationalization"); 534 "in multibyte locales - "
535 "use mbspbrk if you care about internationalization");
534# endif 536# endif
535#elif defined GNULIB_POSIXCHECK 537#elif defined GNULIB_POSIXCHECK
536# undef strpbrk 538# undef strpbrk
537# if HAVE_RAW_DECL_STRPBRK 539# if HAVE_RAW_DECL_STRPBRK
538_GL_WARN_ON_USE (strpbrk, "strpbrk is unportable - " 540_GL_WARN_ON_USE_CXX (strpbrk, const char *, (const char *, const char *),
539 "use gnulib module strpbrk for portability"); 541 "strpbrk is unportable - "
542 "use gnulib module strpbrk for portability");
540# endif 543# endif
541#endif 544#endif
542 545
@@ -555,9 +558,10 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
555 GB18030 and the character to be searched is a digit. */ 558 GB18030 and the character to be searched is a digit. */
556# undef strrchr 559# undef strrchr
557/* Assume strrchr is always declared. */ 560/* Assume strrchr is always declared. */
558_GL_WARN_ON_USE (strrchr, "strrchr cannot work correctly on character strings " 561_GL_WARN_ON_USE_CXX (strrchr, const char *, (const char *, int),
559 "in some multibyte locales - " 562 "strrchr cannot work correctly on character strings "
560 "use mbsrchr if you care about internationalization"); 563 "in some multibyte locales - "
564 "use mbsrchr if you care about internationalization");
561#endif 565#endif
562 566
563/* Search the next delimiter (char listed in DELIM) starting at *STRINGP. 567/* Search the next delimiter (char listed in DELIM) starting at *STRINGP.