]> Savannah Git Hosting - gnulib.git/commitdiff
threads-h: Improve portability.
authorBruno Haible <bruno@clisp.org>
Mon, 9 Jan 2023 20:31:52 +0000 (21:31 +0100)
committerBruno Haible <bruno@clisp.org>
Mon, 9 Jan 2023 20:31:52 +0000 (21:31 +0100)
* 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
lib/threads.in.h
modules/threads-h

index 84226bb5e737a5736afc91e8f40496d63065ce62..92c89d730b691c6ed2401b0bcbeca3e1cb89e623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-09  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        threads-h: Fix compilation errors in C++ mode on Android.
index 5786101d8206e58781bc1f21b452c69dbb507676..e34c39de3f2106390dc9dcaf20e9a1d79c062e3c 100644 (file)
@@ -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
index 1cde2afc9f2e06371272008ee4a588ff85c7888c..e35a5e265bd20c58eeee16de8b11c3183f0ce4a9 100644 (file)
@@ -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' \