]> Savannah Git Hosting - gnulib.git/commitdiff
threads-h: Fix generation of threads.h.
authorBruno Haible <bruno@clisp.org>
Mon, 15 Jul 2019 00:35:46 +0000 (02:35 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 15 Jul 2019 00:35:46 +0000 (02:35 +0200)
* modules/threads-h (Makefile.am): Insert the required header file
snippets.

ChangeLog
modules/threads-h

index 1c9bd5f41367aa05dcf7383ab66cd9c7c2e54e08..65ae25531a092ae4040e9fa08e1870256fbd8166 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-14  Bruno Haible  <bruno@clisp.org>
+
+       threads-h: Fix generation of threads.h.
+       * modules/threads-h (Makefile.am): Insert the required header file
+       snippets.
+
 2019-07-09  Bruno Haible  <bruno@clisp.org>
 
        striconveh test: Fix a compilation failure when iconv is not available.
index c5af53e8122234001545109e1acdd76d351eb147..de9520d7119b4249108511fc938664b0c6038ea8 100644 (file)
@@ -57,6 +57,10 @@ threads.h: threads.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H
              -e 's|@''REPLACE_THRD_DETACH''@|$(REPLACE_THRD_DETACH)|g' \
              -e 's|@''REPLACE_THRD_EQUAL''@|$(REPLACE_THRD_EQUAL)|g' \
              -e 's|@''REPLACE_THRD_JOIN''@|$(REPLACE_THRD_JOIN)|g' \
+             -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+             -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+             -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+             -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
              < $(srcdir)/threads.in.h; \
        } > $@-t && \
        mv $@-t $@