From: Bruno Haible Date: Tue, 24 Dec 2024 10:16:25 +0000 (+0100) Subject: pthread-h: Support several gnulib-tool invocations better. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d00f9aa004f301dca4ccaa7fdd2d4809e84f9e66;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 2354ac6d00..d00de42d1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-12-24 Bruno Haible + + 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 malloc-h: Support several gnulib-tool invocations better. diff --git a/lib/pthread.in.h b/lib/pthread.in.h index d32e79db92..d323dd6cb8 100644 --- a/lib/pthread.in.h +++ b/lib/pthread.in.h @@ -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 -> -> -> -> @@ -39,12 +39,12 @@ #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