>From 021cd86c90d2e94382d8a9feb58d5722f7a558ad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Aug 2023 20:38:51 +0200 Subject: [PATCH 2/4] sys_times: Make double-inclusion guard more robust. * lib/sys_times.in.h: Test the guard symbol a second time. --- ChangeLog | 5 +++++ lib/sys_times.in.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 733921324f..aa401f7efe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-08-26 Bruno Haible + + sys_times: Make double-inclusion guard more robust. + * lib/sys_times.in.h: Test the guard symbol a second time. + 2023-08-26 Bruno Haible uchar: Make #include_next work right. diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h index 5afe9e5703..204fa367fe 100644 --- a/lib/sys_times.in.h +++ b/lib/sys_times.in.h @@ -26,10 +26,12 @@ # endif @PRAGMA_COLUMNS@ +/* The include_next requires a split double-inclusion guard. */ # if @HAVE_SYS_TIMES_H@ # @INCLUDE_NEXT@ @NEXT_SYS_TIMES_H@ # endif +# ifndef _@GUARD_PREFIX@_SYS_TIMES_H # define _@GUARD_PREFIX@_SYS_TIMES_H /* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ @@ -82,4 +84,5 @@ _GL_WARN_ON_USE (times, "times is unportable - " } # endif +# endif /* _@GUARD_PREFIX@_SYS_TIMES_H */ #endif /* _@GUARD_PREFIX@_SYS_TIMES_H */ -- 2.34.1