Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master

1 files changed, 6 insertions, 18 deletions

diff --git a/tests/signal.in.h b/tests/signal.in.h
index 6239b90a..ce844b1a 100644
--- a/tests/signal.in.h
+++ b/tests/signal.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 2006-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
@@ -20,7 +20,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _GL_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
+#if defined __need_sig_atomic_t || defined __need_sigset_t || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_SIGNAL_H || (defined _SIGNAL_H && !defined __SIZEOF_PTHREAD_MUTEX_T)
 /* Special invocation convention:
    - Inside glibc header files.
    - On glibc systems we have a sequence of nested includes
@@ -39,7 +39,7 @@
 
 #ifndef _@GUARD_PREFIX@_SIGNAL_H
 
-#define _GL_ALREADY_INCLUDING_SIGNAL_H
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_SIGNAL_H
 
 /* Define pid_t, uid_t.
    Also, mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.
@@ -50,7 +50,7 @@
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
-#undef _GL_ALREADY_INCLUDING_SIGNAL_H
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_SIGNAL_H
 
 #ifndef _@GUARD_PREFIX@_SIGNAL_H
 #define _@GUARD_PREFIX@_SIGNAL_H
@@ -66,14 +66,14 @@
 # include <sys/param.h>
 #endif
 
-/* Mac OS X 10.3, FreeBSD < 8.0, OpenBSD < 5.1, OSF/1 4.0, Solaris 2.6, Android,
+/* Mac OS X 10.3, FreeBSD < 8.0, OpenBSD < 5.1, Solaris 2.6, Android,
    OS/2 kLIBC declare pthread_sigmask in <pthread.h>, not in <signal.h>.
    But avoid namespace pollution on glibc systems.*/
 #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \
     && ((defined __APPLE__ && defined __MACH__) \
         || (defined __FreeBSD__ && __FreeBSD__ < 8) \
         || (defined __OpenBSD__ && OpenBSD < 201205) \
-        || defined __osf__ || defined __sun || defined __ANDROID__ \
+        || defined __sun || defined __ANDROID__ \
         || defined __KLIBC__) \
     && ! defined __GLIBC__
 # include <pthread.h>
@@ -156,7 +156,6 @@ _GL_CXXALIAS_SYS (sig2str, int, (int signo, char *str));
 _GL_CXXALIASWARN (sig2str);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef sig2str
 # if HAVE_RAW_DECL_SIG2STR
 _GL_WARN_ON_USE (sig2str, "sig2str is not portable - "
                  "use gnulib module sig2str for portability");
@@ -172,7 +171,6 @@ _GL_CXXALIAS_SYS (str2sig, int, (char const *str, int *signo_p));
 _GL_CXXALIASWARN (str2sig);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef str2sig
 # if HAVE_RAW_DECL_STR2SIG
 _GL_WARN_ON_USE (str2sig, "str2sig is not portable - "
                  "use gnulib module sig2str for portability");
@@ -210,7 +208,6 @@ _GL_CXXALIAS_SYS (pthread_sigmask, int,
 _GL_CXXALIASWARN (pthread_sigmask);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef pthread_sigmask
 # if HAVE_RAW_DECL_PTHREAD_SIGMASK
 _GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not portable - "
                  "use gnulib module pthread_sigmask for portability");
@@ -236,7 +233,6 @@ _GL_CXXALIAS_SYS (raise, int, (int sig));
 _GL_CXXALIASWARN (raise);
 # endif
 #elif defined GNULIB_POSIXCHECK
-# undef raise
 /* Assume raise is always declared.  */
 _GL_WARN_ON_USE (raise, "raise can crash on native Windows - "
                  "use gnulib module raise for portability");
@@ -407,37 +403,30 @@ _GL_EXTERN_C int _gl_raise_SIGPIPE (void);
 # endif
 
 #elif defined GNULIB_POSIXCHECK
-# undef sigaddset
 # if HAVE_RAW_DECL_SIGADDSET
 _GL_WARN_ON_USE (sigaddset, "sigaddset is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigdelset
 # if HAVE_RAW_DECL_SIGDELSET
 _GL_WARN_ON_USE (sigdelset, "sigdelset is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigemptyset
 # if HAVE_RAW_DECL_SIGEMPTYSET
 _GL_WARN_ON_USE (sigemptyset, "sigemptyset is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigfillset
 # if HAVE_RAW_DECL_SIGFILLSET
 _GL_WARN_ON_USE (sigfillset, "sigfillset is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigismember
 # if HAVE_RAW_DECL_SIGISMEMBER
 _GL_WARN_ON_USE (sigismember, "sigismember is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigpending
 # if HAVE_RAW_DECL_SIGPENDING
 _GL_WARN_ON_USE (sigpending, "sigpending is unportable - "
                  "use the gnulib module sigprocmask for portability");
 # endif
-# undef sigprocmask
 # if HAVE_RAW_DECL_SIGPROCMASK
 _GL_WARN_ON_USE (sigprocmask, "sigprocmask is unportable - "
                  "use the gnulib module sigprocmask for portability");
@@ -523,7 +512,6 @@ _GL_CXXALIAS_SYS (sigaction, int, (int, const struct sigaction *restrict,
 _GL_CXXALIASWARN (sigaction);
 
 #elif defined GNULIB_POSIXCHECK
-# undef sigaction
 # if HAVE_RAW_DECL_SIGACTION
 _GL_WARN_ON_USE (sigaction, "sigaction is unportable - "
                  "use the gnulib module sigaction for portability");