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=53a65defb05600279390693caf5b14be22d481c9;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 806fea7817..2c23db0c57 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 e3914b58ca..d44c4b5ee8 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@ /* On AIX 7.2 with xlclang++, /usr/include/uchar.h produces compilation errors because it contains typedef definitions of char16_t and char32_t, however @@ -40,6 +40,9 @@ # @INCLUDE_NEXT@ @NEXT_UCHAR_H@ #endif +#ifndef _@GUARD_PREFIX@_UCHAR_H +#define _@GUARD_PREFIX@_UCHAR_H + /* Get uint_least16_t, uint_least32_t. */ #include @@ -309,3 +312,4 @@ _GL_CXXALIASWARN (mbstoc32s); #endif /* _@GUARD_PREFIX@_UCHAR_H */ +#endif /* _@GUARD_PREFIX@_UCHAR_H */