diff options
| author | Paul Eggert | 2020-08-16 14:22:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2020-08-16 14:30:29 -0700 |
| commit | 846657afaf021e8a796335d740ac4a34056abbeb (patch) | |
| tree | a6e9e88571b6ed6b257609bc743879043d02263f /lib/string.in.h | |
| parent | 8c68a15f2ab484dabea4d4c2c760061d8ef440db (diff) | |
| download | emacs-846657afaf021e8a796335d740ac4a34056abbeb.tar.gz emacs-846657afaf021e8a796335d740ac4a34056abbeb.zip | |
Update from Gnulib
This incorporates:
2020-08-16 time_rz: remove unused functions
2020-08-16 time_rz: fix issues with mktime_z failures
2020-08-16 nstrftime: Guide inlining also on clang
2020-08-16 intprops: Avoid bogus warning on clang
2020-08-16 libc-config: Enable __REDIRECT macro also on clang
2020-08-16 regex: Use initializer shorthand syntax also with clang
2020-08-16 regex: Use space optimization also with clang
2020-08-16 Use _Static_assert and static_assert when present on clang
2020-08-16 Use 'throw ()' for optimization in C++ mode also on clang
2020-08-16 stdio: Don't break attribute 'scanf' on clang
2020-08-16 Fix "warning: 'format' attribute ...: rpl_printf"
2020-08-16 Fix "warning: attribute declaration must precede definition"
2020-08-16 Fix undesired warnings
2020-08-16 Don't use Autoconf quadrigraphsxo
2020-08-16 Fix quoting of AC_LANG_PROGRAM arguments
2020-08-16 Assume autoconf >= 2.64
2020-08-15 nstrftime: be more predictable about errno
2020-08-15 canonicalize: Fix autoconf test on MSVC/clang
2020-08-15 Support compiling without -loldnames on native Windows
2020-08-14 mktime, mktime-internal: Remove obsolete code
2020-08-14 Assume tzset exists
* lib/c++defs.h, lib/canonicalize-lgpl.c, lib/cdefs.h, lib/dup2.c:
* lib/fcntl.in.h, lib/getopt-cdefs.in.h, lib/intprops.h, lib/md5.h:
* lib/mktime.c, lib/nstrftime.c, lib/open.c, lib/regcomp.c:
* lib/regex_internal.h, lib/stdio.in.h, lib/stdlib.in.h:
* lib/strftime.h, lib/string.in.h, lib/sys_select.in.h:
* lib/sys_stat.in.h, lib/sys_time.in.h, lib/time.in.h, lib/time_rz.c:
* lib/unistd.in.h, lib/verify.h, m4/00gnulib.m4:
* m4/absolute-header.m4, m4/alloca.m4, m4/canonicalize.m4, m4/dup2.m4:
* m4/fchmodat.m4, m4/fcntl.m4, m4/fdopendir.m4, m4/fpending.m4:
* m4/futimens.m4, m4/getdtablesize.m4, m4/getloadavg.m4:
* m4/gnulib-common.m4, m4/include_next.m4, m4/largefile.m4:
* m4/manywarnings.m4, m4/mktime.m4, m4/nstrftime.m4, m4/open-slash.m4:
* m4/pselect.m4, m4/pthread_sigmask.m4, m4/time_h.m4, m4/utimens.m4:
* m4/utimensat.m4, m4/utimes.m4, m4/warnings.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index c0c1a54f39d..7d83668f6ec 100644 --- a/lib/string.in.h +++ b/lib/string.in.h | |||
| @@ -123,6 +123,12 @@ _GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); | |||
| 123 | #endif | 123 | #endif |
| 124 | 124 | ||
| 125 | 125 | ||
| 126 | #if defined _WIN32 && !defined __CYGWIN__ | ||
| 127 | # undef memccpy | ||
| 128 | # define memccpy _memccpy | ||
| 129 | #endif | ||
| 130 | |||
| 131 | |||
| 126 | /* Return the first instance of C within N bytes of S, or NULL. */ | 132 | /* Return the first instance of C within N bytes of S, or NULL. */ |
| 127 | #if @GNULIB_MEMCHR@ | 133 | #if @GNULIB_MEMCHR@ |
| 128 | # if @REPLACE_MEMCHR@ | 134 | # if @REPLACE_MEMCHR@ |
| @@ -384,6 +390,12 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " | |||
| 384 | # endif | 390 | # endif |
| 385 | _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); | 391 | _GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); |
| 386 | _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); | 392 | _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); |
| 393 | # elif defined _WIN32 && !defined __CYGWIN__ | ||
| 394 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) | ||
| 395 | # undef strdup | ||
| 396 | # define strdup _strdup | ||
| 397 | # endif | ||
| 398 | _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); | ||
| 387 | # else | 399 | # else |
| 388 | # if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup | 400 | # if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup |
| 389 | /* strdup exists as a function and as a macro. Get rid of the macro. */ | 401 | /* strdup exists as a function and as a macro. Get rid of the macro. */ |
| @@ -401,6 +413,9 @@ _GL_CXXALIASWARN (strdup); | |||
| 401 | _GL_WARN_ON_USE (strdup, "strdup is unportable - " | 413 | _GL_WARN_ON_USE (strdup, "strdup is unportable - " |
| 402 | "use gnulib module strdup for portability"); | 414 | "use gnulib module strdup for portability"); |
| 403 | # endif | 415 | # endif |
| 416 | #elif defined _WIN32 && !defined __CYGWIN__ | ||
| 417 | # undef strdup | ||
| 418 | # define strdup _strdup | ||
| 404 | #endif | 419 | #endif |
| 405 | 420 | ||
| 406 | /* Append no more than N characters from SRC onto DEST. */ | 421 | /* Append no more than N characters from SRC onto DEST. */ |