]> Savannah Git Hosting - gnulib.git/commitdiff
signal-h: Support several gnulib-tool invocations better.
authorBruno Haible <bruno@clisp.org>
Tue, 24 Dec 2024 10:25:01 +0000 (11:25 +0100)
committerBruno Haible <bruno@clisp.org>
Wed, 25 Dec 2024 14:35:56 +0000 (15:35 +0100)
* lib/signal.in.h (_GL_ALREADY_INCLUDING_SIGNAL_H): Rename to a macro
that depends on GUARD_PREFIX.

ChangeLog
lib/signal.in.h

index d00de42d1d898b124c682460d63d09f20e3c5423..3764f44f10d7e35d80f749945075d7b674350817 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-24  Bruno Haible  <bruno@clisp.org>
+
+       signal-h: Support several gnulib-tool invocations better.
+       * lib/signal.in.h (_GL_ALREADY_INCLUDING_SIGNAL_H): Rename to a macro
+       that depends on GUARD_PREFIX.
+
 2024-12-24  Bruno Haible  <bruno@clisp.org>
 
        pthread-h: Support several gnulib-tool invocations better.
index 107226e3dcf7860f311df0d2097a1642d63d53c7..f44e63a668064521d5ce25f326f5507835ee9919 100644 (file)
@@ -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