>From d36e4c864296abce903480c48ad7879d4c0c4e6d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Aug 2023 20:33:39 +0200 Subject: [PATCH 1/4] uchar: Make #include_next work right. * lib/uchar.in.h: Use a split double-inclusion guard. --- ChangeLog | 5 +++++ lib/uchar.in.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 851b47e18c..733921324f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-08-26 Bruno Haible + + uchar: Make #include_next work right. + * lib/uchar.in.h: Use a split double-inclusion guard. + 2023-08-26 Paul Eggert utimens: update FIXME date diff --git a/lib/uchar.in.h b/lib/uchar.in.h index ed1a688d0c..3193340242 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -21,13 +21,13 @@ */ #ifndef _@GUARD_PREFIX@_UCHAR_H -#define _@GUARD_PREFIX@_UCHAR_H #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +/* The include_next requires a split double-inclusion guard. */ #if @HAVE_UCHAR_H@ # if defined __HAIKU__ /* Work around . */ @@ -44,6 +44,9 @@ # @INCLUDE_NEXT@ @NEXT_UCHAR_H@ #endif +#ifndef _@GUARD_PREFIX@_UCHAR_H +#define _@GUARD_PREFIX@_UCHAR_H + /* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_BEGIN_C_LINKAGE, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ #if !_GL_CONFIG_H_INCLUDED @@ -800,3 +803,4 @@ _GL_CXXALIASWARN (c32_apply_mapping); _GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UCHAR_H */ +#endif /* _@GUARD_PREFIX@_UCHAR_H */ -- 2.34.1