From: Bruno Haible Date: Tue, 24 Dec 2024 10:15:25 +0000 (+0100) Subject: malloc-h: Support several gnulib-tool invocations better. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=fc05df5bf029c67c652939c54e55df8e486bf858;p=gnulib.git malloc-h: Support several gnulib-tool invocations better. * lib/malloc.in.h (_GL_ALREADY_INCLUDING_MALLOC_H): Rename to a macro that depends on GUARD_PREFIX. --- diff --git a/ChangeLog b/ChangeLog index 9f3081555f..2354ac6d00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + malloc-h: Support several gnulib-tool invocations better. + * lib/malloc.in.h (_GL_ALREADY_INCLUDING_MALLOC_H): Rename to a macro + that depends on GUARD_PREFIX. + 2024-12-24 Bruno Haible locale: Support several gnulib-tool invocations better. diff --git a/lib/malloc.in.h b/lib/malloc.in.h index 59e9c7b2e4..7095e4ec52 100644 --- a/lib/malloc.in.h +++ b/lib/malloc.in.h @@ -19,7 +19,7 @@ #endif @PRAGMA_COLUMNS@ -#if defined _GL_ALREADY_INCLUDING_MALLOC_H +#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_MALLOC_H /* Special invocation convention: - On Android we have a sequence of nested includes -> -> -> -> -> @@ -34,14 +34,14 @@ #ifndef _@GUARD_PREFIX@_MALLOC_H -#define _GL_ALREADY_INCLUDING_MALLOC_H +#define _@GUARD_PREFIX@_ALREADY_INCLUDING_MALLOC_H /* The include_next requires a split double-inclusion guard. */ #if @HAVE_MALLOC_H@ # @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_MALLOC_H@ #endif -#undef _GL_ALREADY_INCLUDING_MALLOC_H +#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_MALLOC_H #ifndef _@GUARD_PREFIX@_MALLOC_H #define _@GUARD_PREFIX@_MALLOC_H