]> 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>
Sat, 26 Aug 2023 18:33:39 +0000 (20:33 +0200)
* lib/uchar.in.h: Use a split double-inclusion guard.

ChangeLog
lib/uchar.in.h

index 851b47e18c26a3e980e2d7c6557576b55d308b4c..733921324fb0a0ae26cb04ceae2f93b651c4000d 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-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        utimens: update FIXME date
index ed1a688d0ce0e80e0f00efed4a8193330277063a..3193340242625b80e2a722190a3ab099294ef0b0 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@
 # if defined __HAIKU__
 /* Work around <https://dev.haiku-os.org/ticket/17040>.  */
@@ -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 */