From 0985d0c8079a7fdb07e8e4dd9c5dfd24e4a9cfb6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Dec 2024 11:25:01 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ lib/signal.in.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 574a519bac..4bc25a006f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + 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 pthread-h: Support several gnulib-tool invocations better. diff --git a/lib/signal.in.h b/lib/signal.in.h index 6239b90adf..18c88f0c1d 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -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 , but in . @@ -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 -- 2.39.5