diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:51:18 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:52:03 -0800 |
| commit | 1b59478f4cf442f5201500b0a9c66f4332fce640 (patch) | |
| tree | 02787d99a0476a28836390ee9e2ff332445381a1 /lib/string.in.h | |
| parent | 50f3949119cd5bb2f058b90d14b2940a3a8a7a0e (diff) | |
| download | emacs-1b59478f4cf442f5201500b0a9c66f4332fce640.tar.gz | |
Update from Gnulib by running admin/merge-gnulib.
Diffstat (limited to 'lib/string.in.h')
| -rw-r--r-- | lib/string.in.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/string.in.h b/lib/string.in.h index 4625c611bf3..9f68e77c767 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -123,21 +123,23 @@ _GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module"); #endif +#if @GNULIB_MDA_MEMCCPY@ /* On native Windows, map 'memccpy' to '_memccpy', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::memccpy always. */ -#if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef memccpy -# define memccpy _memccpy -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef memccpy +# define memccpy _memccpy +# endif _GL_CXXALIAS_MDA (memccpy, void *, (void *dest, const void *src, int c, size_t n)); -#else +# else _GL_CXXALIAS_SYS (memccpy, void *, (void *dest, const void *src, int c, size_t n)); -#endif +# endif _GL_CXXALIASWARN (memccpy); +#endif /* Return the first instance of C within N bytes of S, or NULL. */ @@ -425,7 +427,7 @@ _GL_CXXALIASWARN (strdup); _GL_WARN_ON_USE (strdup, "strdup is unportable - " "use gnulib module strdup for portability"); # endif -#else +#elif @GNULIB_MDA_STRDUP@ /* On native Windows, map 'creat' to '_creat', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::creat always. */ |