>From 7937757f4d37856e8d65f3da5f301c3c28cef532 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 9 Jan 2023 21:31:52 +0100 Subject: [PATCH 2/2] threads-h: Improve portability. * lib/threads.in.h: Use INCLUDE_NEXT_AS_FIRST_DIRECTIVE when possible. * modules/threads-h (Makefile.am): Substitute INCLUDE_NEXT_AS_FIRST_DIRECTIVE and NEXT_AS_FIRST_DIRECTIVE_THREADS_H. --- ChangeLog | 7 +++++++ lib/threads.in.h | 4 ++-- modules/threads-h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84226bb5e7..92c89d730b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-01-09 Bruno Haible + + threads-h: Improve portability. + * lib/threads.in.h: Use INCLUDE_NEXT_AS_FIRST_DIRECTIVE when possible. + * modules/threads-h (Makefile.am): Substitute + INCLUDE_NEXT_AS_FIRST_DIRECTIVE and NEXT_AS_FIRST_DIRECTIVE_THREADS_H. + 2023-01-09 Bruno Haible threads-h: Fix compilation errors in C++ mode on Android. diff --git a/lib/threads.in.h b/lib/threads.in.h index 5786101d82..e34c39de3f 100644 --- a/lib/threads.in.h +++ b/lib/threads.in.h @@ -28,7 +28,7 @@ In this situation, the functions are not yet declared, therefore we cannot provide the C++ aliases. */ -#@INCLUDE_NEXT@ @NEXT_THREADS_H@ +#@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_THREADS_H@ #else /* Normal invocation convention. */ @@ -39,7 +39,7 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_THREADS_H@ -# @INCLUDE_NEXT@ @NEXT_THREADS_H@ +# @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_THREADS_H@ #endif #undef _GL_ALREADY_INCLUDING_THREADS_H diff --git a/modules/threads-h b/modules/threads-h index 1cde2afc9f..e35a5e265b 100644 --- a/modules/threads-h +++ b/modules/threads-h @@ -43,10 +43,12 @@ threads.h: threads.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ -e 's|@''HAVE_THREADS_H''@|$(HAVE_THREADS_H)|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_AS_FIRST_DIRECTIVE_THREADS_H''@|$(NEXT_AS_FIRST_DIRECTIVE_THREADS_H)|g' \ -e 's|@''NEXT_THREADS_H''@|$(NEXT_THREADS_H)|g' \ -e 's/@''GNULIB_CND''@/$(GNULIB_CND)/g' \ -e 's/@''GNULIB_MTX''@/$(GNULIB_MTX)/g' \ -- 2.34.1