]> Savannah Git Hosting - gnulib.git/commitdiff
malloc-h: Support several gnulib-tool invocations better.
authorBruno Haible <bruno@clisp.org>
Tue, 24 Dec 2024 10:15:25 +0000 (11:15 +0100)
committerBruno Haible <bruno@clisp.org>
Wed, 25 Dec 2024 14:27:21 +0000 (15:27 +0100)
* lib/malloc.in.h (_GL_ALREADY_INCLUDING_MALLOC_H): Rename to a macro
that depends on GUARD_PREFIX.

ChangeLog
lib/malloc.in.h

index dd1a475415ff661b8c0617cc484252322cb5daa1..f183597fb166317f285277e94d331282ec8e9b30 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.
index 59e9c7b2e4bccecb3cdcd1e19bf8e5c2baf317ae..7095e4ec52c1106dec984168a8b38e2c77a3aa82 100644 (file)
@@ -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> ->
 
 #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