From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 Dec 2024 10:20:52 +0000 (+0100)
Subject: string: Support several gnulib-tool invocations better.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e9b92b4fc06d24b8df992c3958b82db9d75d470;p=thirdparty%2Fgnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 62a1149468..5037f1bbc5 100644
--- 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.
diff --git a/lib/string.in.h b/lib/string.in.h
index f5a6d8b326..72cd7566e6 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> -> <strings.h> -> "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