diff options
| author | Paul Eggert | 2019-11-26 13:14:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-11-26 13:15:41 -0800 |
| commit | 1b9dbca826ad8a742ab22719279f5ce3c5888a67 (patch) | |
| tree | afd37873182a84f6708c19105fedca1b4d58ddd2 /lib/string.in.h | |
| parent | 50b52390ee5894e91965bd37f2d0c571df1e2e89 (diff) | |
| download | emacs-1b9dbca826ad8a742ab22719279f5ce3c5888a67.tar.gz emacs-1b9dbca826ad8a742ab22719279f5ce3c5888a67.zip | |
Update from Gnulib
This incorporates:
2019-11-24 Fix errors in C++ mode on mingw
2019-11-24 time_r: Fix for mingw (regression from 2019-11-16)
2019-11-24 sys_time: Fix errors in C++ mode on mingw
2019-11-22 intprops: INT_MULTIPLY_WRAPV speedup for GCC 8.4+
2019-11-21 Disable many _GL_CXXALIASWARN on non-glibc
2019-11-21 Fix various errors in _GL_CXXALIAS_SYS invocations
2019-11-19 intprops: INT_MULTIPLY_WRAPV speedup for GCC 9.3+
2019-11-18 stdint: Define [u]intptr_t correctly on 64-bit native Windows
2019-11-18 stdint: Fix value of WINT_MAX when we override wint_t
2019-11-18 stdint: Avoid "conflicting types" error on mingw 5.22
2019-11-16 time_r: Fix for mingw
2019-11-06 regex: now back in sync with glibc
* lib/intprops.h, lib/regexec.c, lib/signal.in.h:
* lib/stdint.in.h, lib/stdio.in.h, lib/stdlib.in.h:
* lib/string.in.h, lib/sys_select.in.h, lib/sys_time.in.h:
* lib/time.in.h, lib/unistd.in.h, m4/time_r.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index c57f041c06d..9b8ced24cd8 100644 --- a/lib/string.in.h +++ b/lib/string.in.h | |||
| @@ -149,7 +149,7 @@ _GL_CXXALIAS_SYS_CAST2 (memchr, | |||
| 149 | _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); | 149 | _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); |
| 150 | _GL_CXXALIASWARN1 (memchr, void const *, | 150 | _GL_CXXALIASWARN1 (memchr, void const *, |
| 151 | (void const *__s, int __c, size_t __n)); | 151 | (void const *__s, int __c, size_t __n)); |
| 152 | # else | 152 | # elif __GLIBC__ >= 2 |
| 153 | _GL_CXXALIASWARN (memchr); | 153 | _GL_CXXALIASWARN (memchr); |
| 154 | # endif | 154 | # endif |
| 155 | #elif defined GNULIB_POSIXCHECK | 155 | #elif defined GNULIB_POSIXCHECK |
| @@ -417,7 +417,9 @@ _GL_CXXALIAS_RPL (strncat, char *, (char *dest, const char *src, size_t n)); | |||
| 417 | # else | 417 | # else |
| 418 | _GL_CXXALIAS_SYS (strncat, char *, (char *dest, const char *src, size_t n)); | 418 | _GL_CXXALIAS_SYS (strncat, char *, (char *dest, const char *src, size_t n)); |
| 419 | # endif | 419 | # endif |
| 420 | # if __GLIBC__ >= 2 | ||
| 420 | _GL_CXXALIASWARN (strncat); | 421 | _GL_CXXALIASWARN (strncat); |
| 422 | # endif | ||
| 421 | #elif defined GNULIB_POSIXCHECK | 423 | #elif defined GNULIB_POSIXCHECK |
| 422 | # undef strncat | 424 | # undef strncat |
| 423 | # if HAVE_RAW_DECL_STRNCAT | 425 | # if HAVE_RAW_DECL_STRNCAT |
| @@ -512,7 +514,7 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk, | |||
| 512 | _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); | 514 | _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); |
| 513 | _GL_CXXALIASWARN1 (strpbrk, char const *, | 515 | _GL_CXXALIASWARN1 (strpbrk, char const *, |
| 514 | (char const *__s, char const *__accept)); | 516 | (char const *__s, char const *__accept)); |
| 515 | # else | 517 | # elif __GLIBC__ >= 2 |
| 516 | _GL_CXXALIASWARN (strpbrk); | 518 | _GL_CXXALIASWARN (strpbrk); |
| 517 | # endif | 519 | # endif |
| 518 | # if defined GNULIB_POSIXCHECK | 520 | # if defined GNULIB_POSIXCHECK |
| @@ -614,7 +616,7 @@ _GL_CXXALIAS_SYS_CAST2 (strstr, | |||
| 614 | _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); | 616 | _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); |
| 615 | _GL_CXXALIASWARN1 (strstr, const char *, | 617 | _GL_CXXALIASWARN1 (strstr, const char *, |
| 616 | (const char *haystack, const char *needle)); | 618 | (const char *haystack, const char *needle)); |
| 617 | # else | 619 | # elif __GLIBC__ >= 2 |
| 618 | _GL_CXXALIASWARN (strstr); | 620 | _GL_CXXALIASWARN (strstr); |
| 619 | # endif | 621 | # endif |
| 620 | #elif defined GNULIB_POSIXCHECK | 622 | #elif defined GNULIB_POSIXCHECK |
| @@ -980,7 +982,9 @@ _GL_CXXALIAS_RPL (strerror, char *, (int)); | |||
| 980 | # else | 982 | # else |
| 981 | _GL_CXXALIAS_SYS (strerror, char *, (int)); | 983 | _GL_CXXALIAS_SYS (strerror, char *, (int)); |
| 982 | # endif | 984 | # endif |
| 985 | # if __GLIBC__ >= 2 | ||
| 983 | _GL_CXXALIASWARN (strerror); | 986 | _GL_CXXALIASWARN (strerror); |
| 987 | # endif | ||
| 984 | #elif defined GNULIB_POSIXCHECK | 988 | #elif defined GNULIB_POSIXCHECK |
| 985 | # undef strerror | 989 | # undef strerror |
| 986 | /* Assume strerror is always declared. */ | 990 | /* Assume strerror is always declared. */ |