From: Bruno Haible Date: Sat, 26 Aug 2023 18:33:39 +0000 (+0200) Subject: uchar: Make #include_next work right. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=8e9c2af08cd39d236f815c77d752b172c1c4bf9d;p=gnulib.git uchar: Make #include_next work right. * lib/uchar.in.h: Use a split double-inclusion guard. --- diff --git a/ChangeLog b/ChangeLog index ce0489e0cd..a3cc6d3dff 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-21 Paul Eggert unlocked-io: fix getc_unlocked typo diff --git a/lib/uchar.in.h b/lib/uchar.in.h index 8bf36b9a9d..98d37f96d0 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 @@ -676,3 +679,4 @@ _GL_CXXALIASWARN (mbstoc32s); _GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UCHAR_H */ +#endif /* _@GUARD_PREFIX@_UCHAR_H */