1 files changed, 41 insertions, 39 deletions

diff --git a/gl/string.in.h b/gl/string.in.h
index 25e6a087..b54ec0ca 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2025 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -80,6 +80,12 @@
 # include <strings.h>
 #endif
 
+_GL_INLINE_HEADER_BEGIN
+
+#ifndef _GL_STRING_INLINE
+# define _GL_STRING_INLINE _GL_INLINE
+#endif
+
 /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
    that can be freed by passing them as the Ith argument to the
    function F.  */
@@ -96,7 +102,7 @@
 /* Applies to: functions.  Cannot be used on inline functions.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
 # if defined __cplusplus && defined __GNUC__ && !defined __clang__
-/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+/* Work around GCC bug <https://gcc.gnu.org/PR108231> */
 #  define _GL_ATTRIBUTE_DEALLOC_FREE \
      _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
 # else
@@ -306,7 +312,6 @@ _GL_FUNCDECL_SYS (explicit_bzero, void,
 _GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n));
 _GL_CXXALIASWARN (explicit_bzero);
 #elif defined GNULIB_POSIXCHECK
-# undef explicit_bzero
 # if HAVE_RAW_DECL_EXPLICIT_BZERO
 _GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is unportable - "
                  "use gnulib module explicit_bzero for portability");
@@ -322,7 +327,6 @@ _GL_FUNCDECL_SYS (ffsl, int, (long int i), );
 _GL_CXXALIAS_SYS (ffsl, int, (long int i));
 _GL_CXXALIASWARN (ffsl);
 #elif defined GNULIB_POSIXCHECK
-# undef ffsl
 # if HAVE_RAW_DECL_FFSL
 _GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
 # endif
@@ -345,7 +349,6 @@ _GL_CXXALIAS_SYS (ffsll, int, (long long int i));
 # endif
 _GL_CXXALIASWARN (ffsll);
 #elif defined GNULIB_POSIXCHECK
-# undef ffsll
 # if HAVE_RAW_DECL_FFSLL
 _GL_WARN_ON_USE (ffsll, "ffsll is not portable - use the ffsll module");
 # endif
@@ -403,7 +406,6 @@ _GL_CXXALIASWARN1 (memchr, void const *,
 _GL_CXXALIASWARN (memchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef memchr
 /* Assume memchr is always declared.  */
 _GL_WARN_ON_USE_CXX (memchr,
                      const void *, void *, (void const *, int, size_t),
@@ -411,6 +413,21 @@ _GL_WARN_ON_USE_CXX (memchr,
                      "use gnulib module memchr for portability" );
 #endif
 
+/* Are S1 and S2, of size N, bytewise equal?  */
+#if @GNULIB_STRINGEQ@ && !@HAVE_DECL_MEMEQ@
+# ifdef __cplusplus
+extern "C" {
+# endif
+_GL_STRING_INLINE bool
+memeq (void const *__s1, void const *__s2, size_t __n)
+{
+  return !memcmp (__s1, __s2, __n);
+}
+# ifdef __cplusplus
+}
+# endif
+#endif
+
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
 #if @GNULIB_MEMMEM@
 # if @REPLACE_MEMMEM@
@@ -439,7 +456,6 @@ _GL_CXXALIAS_SYS (memmem, void *,
 # endif
 _GL_CXXALIASWARN (memmem);
 #elif defined GNULIB_POSIXCHECK
-# undef memmem
 # if HAVE_RAW_DECL_MEMMEM
 _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - "
                  "use gnulib module memmem-simple for portability, "
@@ -477,7 +493,6 @@ _GL_CXXALIAS_SYS (mempcpy, void *,
 _GL_CXXALIASWARN (mempcpy);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef mempcpy
 # if HAVE_RAW_DECL_MEMPCPY
 _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - "
                  "use gnulib module mempcpy for portability");
@@ -510,7 +525,6 @@ _GL_CXXALIASWARN1 (memrchr, void const *,
 _GL_CXXALIASWARN (memrchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef memrchr
 # if HAVE_RAW_DECL_MEMRCHR
 _GL_WARN_ON_USE (memrchr, "memrchr is unportable - "
                  "use gnulib module memrchr for portability");
@@ -541,7 +555,6 @@ _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
 _GL_CXXALIASWARN (memset_explicit);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef memset_explicit
 # if HAVE_RAW_DECL_MEMSET_EXPLICIT
 _GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - "
                  "use gnulib module memset_explicit for portability");
@@ -576,7 +589,6 @@ _GL_CXXALIASWARN1 (rawmemchr, void const *,
 _GL_CXXALIASWARN (rawmemchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef rawmemchr
 # if HAVE_RAW_DECL_RAWMEMCHR
 _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - "
                  "use gnulib module rawmemchr for portability");
@@ -608,7 +620,6 @@ _GL_CXXALIAS_SYS (stpcpy, char *,
 _GL_CXXALIASWARN (stpcpy);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef stpcpy
 # if HAVE_RAW_DECL_STPCPY
 _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
                  "use gnulib module stpcpy for portability");
@@ -645,7 +656,6 @@ _GL_CXXALIAS_SYS (stpncpy, char *,
 _GL_CXXALIASWARN (stpncpy);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef stpncpy
 # if HAVE_RAW_DECL_STPNCPY
 _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
                  "use gnulib module stpncpy for portability");
@@ -655,7 +665,6 @@ _GL_WARN_ON_USE (stpncpy, "stpncpy is unportable - "
 #if defined GNULIB_POSIXCHECK
 /* strchr() does not work with multibyte strings if the locale encoding is
    GB18030 and the character to be searched is a digit.  */
-# undef strchr
 /* Assume strchr is always declared.  */
 _GL_WARN_ON_USE_CXX (strchr,
                      const char *, char *, (const char *, int),
@@ -701,7 +710,6 @@ _GL_CXXALIASWARN1 (strchrnul, char const *,
 _GL_CXXALIASWARN (strchrnul);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strchrnul
 # if HAVE_RAW_DECL_STRCHRNUL
 _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - "
                  "use gnulib module strchrnul for portability");
@@ -766,7 +774,6 @@ _GL_FUNCDECL_SYS (strdup, char *,
 #  endif
 # endif
 # if defined GNULIB_POSIXCHECK
-#  undef strdup
 #  if HAVE_RAW_DECL_STRDUP
 _GL_WARN_ON_USE (strdup, "strdup is unportable - "
                  "use gnulib module strdup for portability");
@@ -791,6 +798,21 @@ _GL_CXXALIASWARN (strdup);
 # endif
 #endif
 
+/* Are strings S1 and S2 equal?  */
+#if @GNULIB_STRINGEQ@ && !@HAVE_DECL_STREQ@
+# ifdef __cplusplus
+extern "C" {
+# endif
+_GL_STRING_INLINE bool
+streq (char const *__s1, char const *__s2)
+{
+  return !strcmp (__s1, __s2);
+}
+# ifdef __cplusplus
+}
+# endif
+#endif
+
 /* Append no more than N characters from SRC onto DEST.  */
 #if @GNULIB_STRNCAT@
 # if @REPLACE_STRNCAT@
@@ -812,7 +834,6 @@ _GL_CXXALIAS_SYS (strncat, char *,
 _GL_CXXALIASWARN (strncat);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strncat
 # if HAVE_RAW_DECL_STRNCAT
 _GL_WARN_ON_USE (strncat, "strncat is unportable - "
                  "use gnulib module strncat for portability");
@@ -896,7 +917,6 @@ _GL_FUNCDECL_SYS (strndup, char *,
 #  endif
 # endif
 # if defined GNULIB_POSIXCHECK
-#  undef strndup
 #  if HAVE_RAW_DECL_STRNDUP
 _GL_WARN_ON_USE (strndup, "strndup is unportable - "
                  "use gnulib module strndup for portability");
@@ -927,7 +947,6 @@ _GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen));
 # endif
 _GL_CXXALIASWARN (strnlen);
 #elif defined GNULIB_POSIXCHECK
-# undef strnlen
 # if HAVE_RAW_DECL_STRNLEN
 _GL_WARN_ON_USE (strnlen, "strnlen is unportable - "
                  "use gnulib module strnlen for portability");
@@ -939,7 +958,6 @@ _GL_WARN_ON_USE (strnlen, "strnlen is unportable - "
    Even in this simple case, it does not work with multibyte strings if the
    locale encoding is GB18030 and one of the characters to be searched is a
    digit.  */
-# undef strcspn
 /* Assume strcspn is always declared.  */
 _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings "
                  "in multibyte locales - "
@@ -976,7 +994,6 @@ _GL_CXXALIASWARN (strpbrk);
    Even in this simple case, it does not work with multibyte strings if the
    locale encoding is GB18030 and one of the characters to be searched is a
    digit.  */
-#  undef strpbrk
 _GL_WARN_ON_USE_CXX (strpbrk,
                      const char *, char *, (const char *, const char *),
                      "strpbrk cannot work correctly on character strings "
@@ -996,7 +1013,6 @@ _GL_WARN_ON_USE_CXX (strpbrk,
 #if defined GNULIB_POSIXCHECK
 /* strspn() assumes the second argument is a list of single-byte characters.
    Even in this simple case, it cannot work with multibyte strings.  */
-# undef strspn
 /* Assume strspn is always declared.  */
 _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
                  "in multibyte locales - "
@@ -1006,7 +1022,6 @@ _GL_WARN_ON_USE (strspn, "strspn cannot work correctly on character strings "
 #if defined GNULIB_POSIXCHECK
 /* strrchr() does not work with multibyte strings if the locale encoding is
    GB18030 and the character to be searched is a digit.  */
-# undef strrchr
 /* Assume strrchr is always declared.  */
 _GL_WARN_ON_USE_CXX (strrchr,
                      const char *, char *, (const char *, int),
@@ -1041,13 +1056,11 @@ _GL_CXXALIAS_SYS (strsep, char *,
                   (char **restrict __stringp, char const *restrict __delim));
 _GL_CXXALIASWARN (strsep);
 # if defined GNULIB_POSIXCHECK
-#  undef strsep
 _GL_WARN_ON_USE (strsep, "strsep cannot work correctly on character strings "
                  "in multibyte locales - "
                  "use mbssep if you care about internationalization");
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strsep
 # if HAVE_RAW_DECL_STRSEP
 _GL_WARN_ON_USE (strsep, "strsep is unportable - "
                  "use gnulib module strsep for portability");
@@ -1142,7 +1155,6 @@ _GL_CXXALIASWARN (strcasestr);
 /* strcasestr() does not work with multibyte strings:
    It is a glibc extension, and glibc implements it only for unibyte
    locales.  */
-# undef strcasestr
 # if HAVE_RAW_DECL_STRCASESTR
 _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character "
                  "strings in multibyte locales - "
@@ -1188,7 +1200,7 @@ _GL_CXXALIAS_RPL (strtok_r, char *,
                   (char *restrict s, char const *restrict delim,
                    char **restrict save_ptr));
 # else
-#  if @UNDEFINE_STRTOK_R@ || defined GNULIB_POSIXCHECK
+#  if @UNDEFINE_STRTOK_R@
 #   undef strtok_r
 #  endif
 #  if ! @HAVE_DECL_STRTOK_R@
@@ -1208,7 +1220,6 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r cannot work correctly on character "
                  "use mbstok_r if you care about internationalization");
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strtok_r
 # if HAVE_RAW_DECL_STRTOK_R
 _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - "
                  "use gnulib module strtok_r for portability");
@@ -1241,7 +1252,7 @@ _GL_EXTERN_C bool str_endswith (const char *string, const char *prefix)
 # ifdef __MirBSD__  /* MirBSD defines mbslen as a macro.  Override it.  */
 #  undef mbslen
 # endif
-# if @HAVE_MBSLEN@  /* AIX, OSF/1, MirBSD define mbslen already in libc.  */
+# if @HAVE_MBSLEN@  /* AIX, MirBSD define mbslen already in libc.  */
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
@@ -1546,8 +1557,6 @@ _GL_EXTERN_C char * mbstok_r (char *restrict string, const char *delim,
 _GL_EXTERN_C bool mbs_startswith (const char *string, const char *prefix)
      _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
-/* No extra code is needed for multibyte locales for this function.  */
-# define mbs_startswith str_startswith
 #endif
 
 #if @GNULIB_MBS_ENDSWITH@
@@ -1576,7 +1585,6 @@ _GL_CXXALIAS_SYS (strerror, char *, (int));
 _GL_CXXALIASWARN (strerror);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strerror
 /* Assume strerror is always declared.  */
 _GL_WARN_ON_USE (strerror, "strerror is unportable - "
                  "use gnulib module strerror to guarantee non-NULL result");
@@ -1604,7 +1612,6 @@ _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
 _GL_CXXALIASWARN (strerror_r);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strerror_r
 # if HAVE_RAW_DECL_STRERROR_R
 _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
                  "use gnulib module strerror_r-posix for portability");
@@ -1633,7 +1640,6 @@ _GL_CXXALIAS_SYS (strerror_l, char *, (int errnum, locale_t locale));
 _GL_CXXALIASWARN (strerror_l);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strerror_l
 # if HAVE_RAW_DECL_STRERROR_L
 _GL_WARN_ON_USE (strerror_l, "strerror_l is unportable - "
                  "use gnulib module strerror_l for portability");
@@ -1668,7 +1674,6 @@ _GL_CXXALIAS_SYS (strerrorname_np, const char *, (int errnum));
 _GL_CXXALIASWARN (strerrorname_np);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef strerrorname_np
 # if HAVE_RAW_DECL_STRERRORNAME_NP
 _GL_WARN_ON_USE (strerrorname_np, "strerrorname_np is unportable - "
                  "use gnulib module strerrorname_np for portability");
@@ -1683,7 +1688,6 @@ _GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig), );
 _GL_CXXALIAS_SYS (sigabbrev_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigabbrev_np);
 #elif defined GNULIB_POSIXCHECK
-# undef sigabbrev_np
 # if HAVE_RAW_DECL_SIGABBREV_NP
 _GL_WARN_ON_USE (sigabbrev_np, "sigabbrev_np is unportable - "
                  "use gnulib module sigabbrev_np for portability");
@@ -1698,7 +1702,6 @@ _GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig), );
 _GL_CXXALIAS_SYS (sigdescr_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigdescr_np);
 #elif defined GNULIB_POSIXCHECK
-# undef sigdescr_np
 # if HAVE_RAW_DECL_SIGDESCR_NP
 _GL_WARN_ON_USE (sigdescr_np, "sigdescr_np is unportable - "
                  "use gnulib module sigdescr_np for portability");
@@ -1722,7 +1725,6 @@ _GL_CXXALIAS_SYS_CAST (strsignal, char *, (int __sig));
 # endif
 _GL_CXXALIASWARN (strsignal);
 #elif defined GNULIB_POSIXCHECK
-# undef strsignal
 # if HAVE_RAW_DECL_STRSIGNAL
 _GL_WARN_ON_USE (strsignal, "strsignal is unportable - "
                  "use gnulib module strsignal for portability");
@@ -1748,13 +1750,13 @@ _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
 # endif
 _GL_CXXALIASWARN (strverscmp);
 #elif defined GNULIB_POSIXCHECK
-# undef strverscmp
 # if HAVE_RAW_DECL_STRVERSCMP
 _GL_WARN_ON_USE (strverscmp, "strverscmp is unportable - "
                  "use gnulib module strverscmp for portability");
 # endif
 #endif
 
+_GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_STRING_H */
 #endif /* _@GUARD_PREFIX@_STRING_H */