mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
; Update from Gnulib
* configure.ac: * src/conf_post.h: Remove workarounds now rendered redundant by Gnulib.
This commit is contained in:
parent
a13eef1fae
commit
1a13c5e63e
57 changed files with 2048 additions and 925 deletions
126
lib/string.in.h
126
lib/string.in.h
|
|
@ -79,7 +79,7 @@
|
|||
that can be freed by passing them as the Ith argument to the
|
||||
function F. */
|
||||
#ifndef _GL_ATTRIBUTE_DEALLOC
|
||||
# if __GNUC__ >= 11
|
||||
# if __GNUC__ >= 11 && !defined __clang__
|
||||
# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
|
||||
# else
|
||||
# define _GL_ATTRIBUTE_DEALLOC(f, i)
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
*/
|
||||
#ifndef _GL_ATTRIBUTE_NOTHROW
|
||||
# if defined __cplusplus
|
||||
# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
|
||||
# if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
|
||||
# if __cplusplus >= 201103L
|
||||
# define _GL_ATTRIBUTE_NOTHROW noexcept (true)
|
||||
# else
|
||||
|
|
@ -198,7 +198,7 @@ _GL_EXTERN_C void free (void *);
|
|||
#if @GNULIB_EXPLICIT_BZERO@
|
||||
# if ! @HAVE_EXPLICIT_BZERO@
|
||||
_GL_FUNCDECL_SYS (explicit_bzero, void,
|
||||
(void *__dest, size_t __n) _GL_ARG_NONNULL ((1)));
|
||||
(void *__dest, size_t __n), _GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n));
|
||||
_GL_CXXALIASWARN (explicit_bzero);
|
||||
|
|
@ -274,7 +274,7 @@ _GL_CXXALIASWARN (memccpy);
|
|||
# undef memchr
|
||||
# define memchr rpl_memchr
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
|
||||
_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
|
||||
|
|
@ -313,7 +313,7 @@ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
|
|||
# endif
|
||||
_GL_FUNCDECL_RPL (memmem, void *,
|
||||
(void const *__haystack, size_t __haystack_len,
|
||||
void const *__needle, size_t __needle_len)
|
||||
void const *__needle, size_t __needle_len),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 3)));
|
||||
_GL_CXXALIAS_RPL (memmem, void *,
|
||||
|
|
@ -323,7 +323,7 @@ _GL_CXXALIAS_RPL (memmem, void *,
|
|||
# if ! @HAVE_DECL_MEMMEM@
|
||||
_GL_FUNCDECL_SYS (memmem, void *,
|
||||
(void const *__haystack, size_t __haystack_len,
|
||||
void const *__needle, size_t __needle_len)
|
||||
void const *__needle, size_t __needle_len),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 3)));
|
||||
# endif
|
||||
|
|
@ -351,7 +351,7 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - "
|
|||
# endif
|
||||
_GL_FUNCDECL_RPL (mempcpy, void *,
|
||||
(void *restrict __dest, void const *restrict __src,
|
||||
size_t __n)
|
||||
size_t __n),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (mempcpy, void *,
|
||||
(void *restrict __dest, void const *restrict __src,
|
||||
|
|
@ -360,7 +360,7 @@ _GL_CXXALIAS_RPL (mempcpy, void *,
|
|||
# if !@HAVE_MEMPCPY@
|
||||
_GL_FUNCDECL_SYS (mempcpy, void *,
|
||||
(void *restrict __dest, void const *restrict __src,
|
||||
size_t __n)
|
||||
size_t __n),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (mempcpy, void *,
|
||||
|
|
@ -381,7 +381,7 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - "
|
|||
/* Search backwards through a block for a byte (specified as an int). */
|
||||
#if @GNULIB_MEMRCHR@
|
||||
# if ! @HAVE_DECL_MEMRCHR@
|
||||
_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
|
||||
_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
|
|
@ -420,12 +420,12 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - "
|
|||
# define memset_explicit rpl_memset_explicit
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (memset_explicit, void *,
|
||||
(void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
|
||||
(void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n));
|
||||
# else
|
||||
# if !@HAVE_MEMSET_EXPLICIT@
|
||||
_GL_FUNCDECL_SYS (memset_explicit, void *,
|
||||
(void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
|
||||
(void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
|
||||
# endif
|
||||
|
|
@ -443,7 +443,7 @@ _GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - "
|
|||
occur within N bytes. */
|
||||
#if @GNULIB_RAWMEMCHR@
|
||||
# if ! @HAVE_RAWMEMCHR@
|
||||
_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
|
||||
_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
|
|
@ -481,14 +481,14 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - "
|
|||
# define stpcpy rpl_stpcpy
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (stpcpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src)
|
||||
(char *restrict __dst, char const *restrict __src),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (stpcpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src));
|
||||
# else
|
||||
# if !@HAVE_STPCPY@
|
||||
_GL_FUNCDECL_SYS (stpcpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src)
|
||||
(char *restrict __dst, char const *restrict __src),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (stpcpy, char *,
|
||||
|
|
@ -515,7 +515,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
|
|||
# endif
|
||||
_GL_FUNCDECL_RPL (stpncpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src,
|
||||
size_t __n)
|
||||
size_t __n),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (stpncpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src,
|
||||
|
|
@ -524,7 +524,7 @@ _GL_CXXALIAS_RPL (stpncpy, char *,
|
|||
# if ! @HAVE_STPNCPY@
|
||||
_GL_FUNCDECL_SYS (stpncpy, char *,
|
||||
(char *restrict __dst, char const *restrict __src,
|
||||
size_t __n)
|
||||
size_t __n),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (stpncpy, char *,
|
||||
|
|
@ -560,14 +560,14 @@ _GL_WARN_ON_USE_CXX (strchr,
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define strchrnul rpl_strchrnul
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in)
|
||||
_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (strchrnul, char *,
|
||||
(const char *str, int ch));
|
||||
# else
|
||||
# if ! @HAVE_STRCHRNUL@
|
||||
_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
|
||||
_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
|
|
@ -606,7 +606,7 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - "
|
|||
# define strdup rpl_strdup
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strdup, char *,
|
||||
(char const *__s)
|
||||
(char const *__s),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
_GL_CXXALIAS_RPL (strdup, char *, (char const *__s));
|
||||
|
|
@ -621,16 +621,17 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s));
|
|||
/* strdup exists as a function and as a macro. Get rid of the macro. */
|
||||
# undef strdup
|
||||
# endif
|
||||
# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup
|
||||
# if (!@HAVE_DECL_STRDUP@ || (__GNUC__ >= 11 && !defined __clang__)) \
|
||||
&& !defined strdup
|
||||
# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
|
||||
_GL_FUNCDECL_SYS (strdup, char *,
|
||||
(char const *__s)
|
||||
_GL_ATTRIBUTE_NOTHROW
|
||||
(char const *__s),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
|
||||
_GL_ATTRIBUTE_NOTHROW;
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (strdup, char *,
|
||||
(char const *__s)
|
||||
(char const *__s),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
# endif
|
||||
|
|
@ -639,17 +640,17 @@ _GL_CXXALIAS_SYS (strdup, char *, (char const *__s));
|
|||
# endif
|
||||
_GL_CXXALIASWARN (strdup);
|
||||
#else
|
||||
# if __GNUC__ >= 11 && !defined strdup
|
||||
# if (__GNUC__ >= 11 && !defined __clang__) && !defined strdup
|
||||
/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */
|
||||
# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
|
||||
_GL_FUNCDECL_SYS (strdup, char *,
|
||||
(char const *__s)
|
||||
_GL_ATTRIBUTE_NOTHROW
|
||||
(char const *__s),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
|
||||
_GL_ATTRIBUTE_NOTHROW;
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (strdup, char *,
|
||||
(char const *__s)
|
||||
(char const *__s),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
# endif
|
||||
|
|
@ -688,7 +689,7 @@ _GL_CXXALIASWARN (strdup);
|
|||
# define strncat rpl_strncat
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strncat, char *,
|
||||
(char *restrict dest, const char *restrict src, size_t n)
|
||||
(char *restrict dest, const char *restrict src, size_t n),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (strncat, char *,
|
||||
(char *restrict dest, const char *restrict src, size_t n));
|
||||
|
|
@ -715,21 +716,22 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - "
|
|||
# define strndup rpl_strndup
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strndup, char *,
|
||||
(char const *__s, size_t __n)
|
||||
(char const *__s, size_t __n),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_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 && !defined strndup)
|
||||
# if !@HAVE_DECL_STRNDUP@ \
|
||||
|| ((__GNUC__ >= 11 && !defined __clang__) && !defined strndup)
|
||||
# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
|
||||
_GL_FUNCDECL_SYS (strndup, char *,
|
||||
(char const *__s, size_t __n)
|
||||
_GL_ATTRIBUTE_NOTHROW
|
||||
(char const *__s, size_t __n),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
|
||||
_GL_ATTRIBUTE_NOTHROW;
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (strndup, char *,
|
||||
(char const *__s, size_t __n)
|
||||
(char const *__s, size_t __n),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
# endif
|
||||
|
|
@ -738,17 +740,17 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
|
|||
# endif
|
||||
_GL_CXXALIASWARN (strndup);
|
||||
#else
|
||||
# if __GNUC__ >= 11 && !defined strndup
|
||||
# if (__GNUC__ >= 11 && !defined __clang__) && !defined strndup
|
||||
/* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */
|
||||
# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
|
||||
_GL_FUNCDECL_SYS (strndup, char *,
|
||||
(char const *__s, size_t __n)
|
||||
_GL_ATTRIBUTE_NOTHROW
|
||||
(char const *__s, size_t __n),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
|
||||
_GL_ATTRIBUTE_NOTHROW;
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (strndup, char *,
|
||||
(char const *__s, size_t __n)
|
||||
(char const *__s, size_t __n),
|
||||
_GL_ARG_NONNULL ((1))
|
||||
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
|
||||
# endif
|
||||
|
|
@ -771,13 +773,13 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - "
|
|||
# undef strnlen
|
||||
# define strnlen rpl_strnlen
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
|
||||
_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
|
||||
# else
|
||||
# if ! @HAVE_DECL_STRNLEN@
|
||||
_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
|
||||
_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
# endif
|
||||
|
|
@ -807,7 +809,7 @@ _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings "
|
|||
/* Find the first occurrence in S of any character in ACCEPT. */
|
||||
#if @GNULIB_STRPBRK@
|
||||
# if ! @HAVE_STRPBRK@
|
||||
_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
|
||||
_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
|
|
@ -892,7 +894,7 @@ _GL_WARN_ON_USE_CXX (strrchr,
|
|||
#if @GNULIB_STRSEP@
|
||||
# if ! @HAVE_STRSEP@
|
||||
_GL_FUNCDECL_SYS (strsep, char *,
|
||||
(char **restrict __stringp, char const *restrict __delim)
|
||||
(char **restrict __stringp, char const *restrict __delim),
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (strsep, char *,
|
||||
|
|
@ -917,7 +919,7 @@ _GL_WARN_ON_USE (strsep, "strsep is unportable - "
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define strstr rpl_strstr
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
|
||||
_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
|
||||
|
|
@ -963,7 +965,7 @@ _GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot "
|
|||
# define strcasestr rpl_strcasestr
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strcasestr, char *,
|
||||
(const char *haystack, const char *needle)
|
||||
(const char *haystack, const char *needle),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (strcasestr, char *,
|
||||
|
|
@ -971,7 +973,7 @@ _GL_CXXALIAS_RPL (strcasestr, char *,
|
|||
# else
|
||||
# if ! @HAVE_STRCASESTR@
|
||||
_GL_FUNCDECL_SYS (strcasestr, char *,
|
||||
(const char *haystack, const char *needle)
|
||||
(const char *haystack, const char *needle),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
|
|
@ -1038,7 +1040,7 @@ _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character "
|
|||
# endif
|
||||
_GL_FUNCDECL_RPL (strtok_r, char *,
|
||||
(char *restrict s, char const *restrict delim,
|
||||
char **restrict save_ptr)
|
||||
char **restrict save_ptr),
|
||||
_GL_ARG_NONNULL ((2, 3)));
|
||||
_GL_CXXALIAS_RPL (strtok_r, char *,
|
||||
(char *restrict s, char const *restrict delim,
|
||||
|
|
@ -1050,7 +1052,7 @@ _GL_CXXALIAS_RPL (strtok_r, char *,
|
|||
# if ! @HAVE_DECL_STRTOK_R@
|
||||
_GL_FUNCDECL_SYS (strtok_r, char *,
|
||||
(char *restrict s, char const *restrict delim,
|
||||
char **restrict save_ptr)
|
||||
char **restrict save_ptr),
|
||||
_GL_ARG_NONNULL ((2, 3)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (strtok_r, char *,
|
||||
|
|
@ -1085,12 +1087,12 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - "
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define mbslen rpl_mbslen
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string)
|
||||
_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (mbslen, size_t, (const char *string));
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string)
|
||||
_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_SYS (mbslen, size_t, (const char *string));
|
||||
|
|
@ -1117,12 +1119,12 @@ _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define mbschr rpl_mbschr /* avoid collision with HP-UX function */
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c)
|
||||
_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c));
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c)
|
||||
_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c));
|
||||
|
|
@ -1139,12 +1141,12 @@ _GL_CXXALIASWARN (mbschr);
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define mbsrchr rpl_mbsrchr /* avoid collision with system function */
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
|
||||
_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c));
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c)
|
||||
_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1)));
|
||||
_GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c));
|
||||
|
|
@ -1234,12 +1236,12 @@ _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept)
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept)
|
||||
_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept));
|
||||
# else
|
||||
_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept)
|
||||
_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept));
|
||||
|
|
@ -1329,12 +1331,12 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - "
|
|||
# undef strerror_r
|
||||
# define strerror_r rpl_strerror_r
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
|
||||
_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen),
|
||||
_GL_ARG_NONNULL ((2)));
|
||||
_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
|
||||
# else
|
||||
# if !@HAVE_DECL_STRERROR_R@
|
||||
_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
|
||||
_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen),
|
||||
_GL_ARG_NONNULL ((2)));
|
||||
# endif
|
||||
_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
|
||||
|
|
@ -1433,13 +1435,13 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - "
|
|||
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||
# define strverscmp rpl_strverscmp
|
||||
# endif
|
||||
_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *)
|
||||
_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
_GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *));
|
||||
# else
|
||||
# if !@HAVE_STRVERSCMP@
|
||||
_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
|
||||
_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *),
|
||||
_GL_ATTRIBUTE_PURE
|
||||
_GL_ARG_NONNULL ((1, 2)));
|
||||
# endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue