From: Bruno Haible Date: Mon, 9 Jan 2023 20:18:20 +0000 (+0100) Subject: malloc-h: Improve portability. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=46279ca04746e2549c35edc03df7f88acc492762;p=gnulib.git malloc-h: Improve portability. * lib/malloc.in.h: Use INCLUDE_NEXT_AS_FIRST_DIRECTIVE when possible. * modules/malloc-h (Makefile.am): Substitute INCLUDE_NEXT_AS_FIRST_DIRECTIVE and NEXT_AS_FIRST_DIRECTIVE_MALLOC_H. --- diff --git a/ChangeLog b/ChangeLog index 78374c683d..d018180a72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-01-09 Bruno Haible + + malloc-h: Improve portability. + * lib/malloc.in.h: Use INCLUDE_NEXT_AS_FIRST_DIRECTIVE when possible. + * modules/malloc-h (Makefile.am): Substitute + INCLUDE_NEXT_AS_FIRST_DIRECTIVE and NEXT_AS_FIRST_DIRECTIVE_MALLOC_H. + 2023-01-05 Bruno Haible copy-file, supersede: Fix link-time requirements. diff --git a/lib/malloc.in.h b/lib/malloc.in.h index de661f0f4b..7c74601f87 100644 --- a/lib/malloc.in.h +++ b/lib/malloc.in.h @@ -23,7 +23,7 @@ /* The include_next requires a split double-inclusion guard. */ #if @HAVE_MALLOC_H@ -# @INCLUDE_NEXT@ @NEXT_MALLOC_H@ +# @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_MALLOC_H@ #endif #ifndef _@GUARD_PREFIX@_MALLOC_H diff --git a/modules/malloc-h b/modules/malloc-h index 085471e1ef..af26e33576 100644 --- a/modules/malloc-h +++ b/modules/malloc-h @@ -24,10 +24,12 @@ malloc.h: malloc.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_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_MALLOC_H''@|$(HAVE_MALLOC_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_MALLOC_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MALLOC_H)|g' \ -e 's|@''NEXT_MALLOC_H''@|$(NEXT_MALLOC_H)|g' \ -e 's/@''GNULIB_MEMALIGN''@/$(GNULIB_MEMALIGN)/g' \ -e 's|@''HAVE_MEMALIGN''@|$(HAVE_MEMALIGN)|g' \