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

ChangeLog
lib/pthread.in.h

index 2354ac6d001afa0251e11a509fb2ce810d6c332c..d00de42d1d898b124c682460d63d09f20e3c5423 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-12-24  Bruno Haible  <bruno@clisp.org>
+
+       pthread-h: Support several gnulib-tool invocations better.
+       * lib/pthread.in.h (_GL_ALREADY_INCLUDING_PTHREAD_H): Rename to a macro
+       that depends on GUARD_PREFIX.
+
 2024-12-24  Bruno Haible  <bruno@clisp.org>
 
        malloc-h: Support several gnulib-tool invocations better.
index d32e79db92b83674e9fe9028cb854b30f9d8222e..d323dd6cb8cc4f19f0adf0cc762c6eb189e3b3a1 100644 (file)
@@ -22,7 +22,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined _GL_ALREADY_INCLUDING_PTHREAD_H
+#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
 /* Special invocation convention:
    On Android, we have a sequence of nested includes
    <pthread.h> -> <time.h> -> <sys/time.h> -> <sys/select.h> ->
 
 #if @HAVE_PTHREAD_H@
 
-# define _GL_ALREADY_INCLUDING_PTHREAD_H
+# define _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
 
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_PTHREAD_H@
 
-# undef _GL_ALREADY_INCLUDING_PTHREAD_H
+# undef _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
 
 #endif