]> Savannah Git Hosting - gnulib.git/commitdiff
malloc-h: Improve portability.
authorBruno Haible <bruno@clisp.org>
Mon, 9 Jan 2023 20:18:20 +0000 (21:18 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 14 Jan 2023 20:24:43 +0000 (21:24 +0100)
* 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.

ChangeLog
lib/malloc.in.h
modules/malloc-h

index 78374c683de4c01f631a05708d8497b2943a7c85..d018180a72356c647368cbcc5e8120bbc6dc0c31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-09  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        copy-file, supersede: Fix link-time requirements.
index de661f0f4b728682d7e559f3f62557ea66e4170c..7c74601f8776bfa27eb71dc5ea335be32daa0e38 100644 (file)
@@ -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
index 085471e1efbb749ff2cb21d022ae729dbe2c3509..af26e33576d32d2eff31d5c48e77f1295e7d576e 100644 (file)
@@ -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' \