From 143d6b17fa01eba73bb253b839b38dd5e6a50606 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Dec 2024 11:17:31 +0100 Subject: [PATCH] spawn: Support several gnulib-tool invocations better. * lib/spawn.in.h (_GL_ALREADY_INCLUDING_SPAWN_H): Rename to a macro that depends on GUARD_PREFIX. --- ChangeLog | 6 ++++++ lib/spawn.in.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bc25a006f..ba83b79725 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + spawn: Support several gnulib-tool invocations better. + * lib/spawn.in.h (_GL_ALREADY_INCLUDING_SPAWN_H): Rename to a macro that + depends on GUARD_PREFIX. + 2024-12-24 Bruno Haible signal-h: Support several gnulib-tool invocations better. diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 5f42407d87..7bf7af60d5 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -20,7 +20,7 @@ #endif @PRAGMA_COLUMNS@ -#if defined _GL_ALREADY_INCLUDING_SPAWN_H +#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_SPAWN_H /* Special invocation convention: On OS/2 kLIBC, includes . Then -> -> -> are included by GNULIB. @@ -36,11 +36,11 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SPAWN_H@ -# define _GL_ALREADY_INCLUDING_SPAWN_H +# define _@GUARD_PREFIX@_ALREADY_INCLUDING_SPAWN_H # @INCLUDE_NEXT@ @NEXT_SPAWN_H@ -# define _GL_ALREADY_INCLUDING_SPAWN_H +# define _@GUARD_PREFIX@_ALREADY_INCLUDING_SPAWN_H #endif -- 2.39.5