]> Savannah Git Hosting - gnulib.git/commitdiff
uchar: Make #include_next work right.
authorBruno Haible <bruno@clisp.org>
Sat, 26 Aug 2023 18:33:39 +0000 (20:33 +0200)
committerBruno Haible <bruno@clisp.org>
Wed, 30 Aug 2023 10:27:05 +0000 (12:27 +0200)
* lib/uchar.in.h: Use a split double-inclusion guard.

ChangeLog
lib/uchar.in.h

index 806fea7817afd332c3fea68edea33962811bb542..2c23db0c57b84dcd0446c7b47dfb96cc11c8160b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-26  Bruno Haible  <bruno@clisp.org>
+
+       uchar: Make #include_next work right.
+       * lib/uchar.in.h: Use a split double-inclusion guard.
+
 2023-08-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        unlocked-io: fix getc_unlocked typo
index e3914b58cab880c764246e96a307c49693f734e6..d44c4b5ee81b86f1076361ce63c938a0287cb02c 100644 (file)
  */
 
 #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 <stdint.h>
 
@@ -309,3 +312,4 @@ _GL_CXXALIASWARN (mbstoc32s);
 
 
 #endif /* _@GUARD_PREFIX@_UCHAR_H */
+#endif /* _@GUARD_PREFIX@_UCHAR_H */