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