From bfd123989bfde2e558d5c26e0caeff08584858f0 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Fri, 23 Jan 2026 09:40:09 +0100
Subject: strange auto-updates in GNUlib

---
 gl/uchar.h | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'gl/uchar.h')

diff --git a/gl/uchar.h b/gl/uchar.h
index abc636c5..a06ed8ab 100644
--- a/gl/uchar.h
+++ b/gl/uchar.h
@@ -204,16 +204,6 @@
 #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
 
-/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
-   parenthesized func otherwise.  Parenthesization is needed in C23 if
-   the function is like strchr and so is a qualifier-generic macro
-   that expands to something more complicated.  */
-#ifdef __cplusplus
-# define _GL_FUNCDECL_SYS_NAME(func) func
-#else
-# define _GL_FUNCDECL_SYS_NAME(func) (func)
-#endif
-
 /* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
    declares the system function, named func, with the given prototype,
    consisting of return type, parameters, and attributes.
@@ -226,7 +216,7 @@
      _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
  */
 #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
-  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
 
 /* _GL_CXXALIAS_RPL (func, rettype, parameters);
    declares a C++ alias called GNULIB_NAMESPACE::func
@@ -397,7 +387,7 @@
    _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN_1(func,namespace) \
    _GL_CXXALIASWARN_2 (func, namespace)
-/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
    we enable the warning only when not optimizing.  */
 # if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
 #  define _GL_CXXALIASWARN_2(func,namespace) \
@@ -425,7 +415,7 @@
                         GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
    _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+/* To work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
    we enable the warning only when not optimizing.  */
 # if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
 #  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
@@ -1037,6 +1027,7 @@ _GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
 _GL_CXXALIASWARN (c32rtomb);
 # endif
 #elif defined GNULIB_POSIXCHECK
+# undef c32rtomb
 # if HAVE_RAW_DECL_C32RTOMB
 _GL_WARN_ON_USE (c32rtomb, "c32rtomb is not portable - "
                  "use gnulib module c32rtomb for portability");
@@ -1193,6 +1184,7 @@ _GL_CXXALIAS_SYS (mbrtoc32, size_t,
 _GL_CXXALIASWARN (mbrtoc32);
 # endif
 #elif defined GNULIB_POSIXCHECK
+# undef mbrtoc32
 # if HAVE_RAW_DECL_MBRTOC32
 _GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - "
                  "use gnulib module mbrtoc32 for portability");
@@ -1224,6 +1216,7 @@ _GL_CXXALIAS_SYS (mbrtoc16, size_t,
 _GL_CXXALIASWARN (mbrtoc16);
 # endif
 #elif defined GNULIB_POSIXCHECK
+# undef mbrtoc16
 # if HAVE_RAW_DECL_MBRTOC16
 _GL_WARN_ON_USE (mbrtoc16, "mbrtoc16 is not portable - "
                  "use gnulib module mbrtoc16 for portability");
-- 
cgit v1.2.3-74-g34f1