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 d7793aab69fe5648a2906bdb114f81042e06c67f..c87b7366e05f586e958cfdea2297cc8ebf52882b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-24  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        locale: Support several gnulib-tool invocations better.

diff --git a/lib/malloc.in.h b/lib/malloc.in.h
index a22a4a8a39155827dbc3f2322f9cde1aa6082c7c..ed90ea36ad589cdf3721e48373eee20c7a40517a 100644 (file)
--- 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
        <malloc.h> -> <stdio.h> -> <sys/stat.h> -> <time.h> -> <sys/time.h> ->
@@ -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