From 4d5c6d798c9f0b0dd2744df135a5350ac8cb8ca9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 24 Dec 2024 11:20:52 +0100 Subject: [PATCH] string: Support several gnulib-tool invocations better. * lib/string.in.h (_GL_ALREADY_INCLUDING_STRING_H): Rename to a macro that depends on GUARD_PREFIX. --- ChangeLog | 6 ++++++ lib/string.in.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2deb5a5ef6..9e39885d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + string: Support several gnulib-tool invocations better. + * lib/string.in.h (_GL_ALREADY_INCLUDING_STRING_H): Rename to a macro + that depends on GUARD_PREFIX. + 2024-12-24 Bruno Haible stdio: Support several gnulib-tool invocations better. diff --git a/lib/string.in.h b/lib/string.in.h index 903ba6e76e..03ab36335b 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -20,7 +20,7 @@ #endif @PRAGMA_COLUMNS@ -#if defined _GL_ALREADY_INCLUDING_STRING_H +#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H /* Special invocation convention: - On OS X/NetBSD we have a sequence of nested includes -> -> "string.h" @@ -34,12 +34,12 @@ #ifndef _@GUARD_PREFIX@_STRING_H -#define _GL_ALREADY_INCLUDING_STRING_H +#define _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ -#undef _GL_ALREADY_INCLUDING_STRING_H +#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H -- 2.39.5