1 files changed, 5 insertions, 14 deletions

diff --git a/gl/sched.h b/gl/sched.h
index 4d9d546d..7fd645f0 100644
--- a/gl/sched.h
+++ b/gl/sched.h
@@ -47,7 +47,7 @@
 
 /* Get pid_t.
    This is needed on glibc 2.11 (see
-   glibc bug <https://sourceware.org/PR13198>)
+   glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=13198>)
    and Mac OS X 10.5.  */
 #include <sys/types.h>
 
@@ -191,16 +191,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.
@@ -213,7 +203,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
@@ -384,7 +374,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) \
@@ -412,7 +402,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) \
@@ -621,6 +611,7 @@ _GL_CXXALIAS_SYS (sched_yield, int, (void));
 _GL_CXXALIASWARN (sched_yield);
 # endif
 #elif defined GNULIB_POSIXCHECK
+# undef sched_yield
 # if HAVE_RAW_DECL_SCHED_YIELD
 _GL_WARN_ON_USE (sched_yield, "sched_yield is not portable - "
                  "use gnulib module sched_yield for portability");