diff options
author | Bruno Haible <bruno@clisp.org> | 2023-02-11 21:12:00 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2023-02-11 21:12:00 +0100 |
commit | 8e3b4ac39b421fdd0a9083b6cae06fd6fadd8f63 (patch) | |
tree | 96fc8d696c745f8108a49af1c4cf1364aa04e6ed /modules/error-h | |
parent | a4f85089e30f89dcb3c0da59ac8a70115d529f72 (diff) | |
download | gnulib-8e3b4ac39b421fdd0a9083b6cae06fd6fadd8f63.tar.gz |
error-h: Make less fragile.
* lib/error.in.h: Use #include_next if the system has an <error.h>. Use
a split double-inclusion guard.
* m4/error_h.m4 (gl_ERROR_H): Invoke gl_CHECK_NEXT_HEADERS. Set
HAVE_ERROR_H.
* modules/error-h (Makefile.am): Substitute GUARD_PREFIX, HAVE_ERROR_H,
INCLUDE_NEXT, PRAGMA_SYSTEM_HEADER, NEXT_ERROR_H.
Diffstat (limited to 'modules/error-h')
-rw-r--r-- | modules/error-h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/error-h b/modules/error-h index 80bc06194b..a84d8e2705 100644 --- a/modules/error-h +++ b/modules/error-h @@ -23,6 +23,11 @@ if GL_GENERATE_ERROR_H error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_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|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ |