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

ChangeLog
lib/string.in.h

index 2deb5a5ef684dcff1d40e75c537ee82d39b71217..9e39885d645ce12305155c646d3e575201c6181f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-24  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        stdio: Support several gnulib-tool invocations better.
index 903ba6e76e807c7ea62fbeba00b691942148b72f..03ab36335b71a0cf6ca52c899954195eeb08ba35 100644 (file)
@@ -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> -> <strings.h> -> "string.h"
 
 #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