Now that sys/un.h might be replaced by Gnulib we have to keep in mind
the #include <...> vs. #include "..." issue.
I also noticed some other files in lib/*.in.h were missing from the
lists so I added them too.
First patch is adding them to the docs and second is adding them to
maint.mk. Separate patches since I'm not sure if docs or maint.mk are
back ported to stable branches. So it seemed less problematic that way.
Collin
>From fed775d6957c6219af59b301a55fcd7c101015b7 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Fri, 26 Jul 2024 21:11:20 -0700
Subject: [PATCH 1/2] doc: Update list of headers to use #include <...>.
* doc/gnulib-tool.texi (Style of #include statements): Add missing
headers from lib/*.in.h. Re-sort list.
---
ChangeLog | 4 ++++
doc/gnulib-tool.texi | 12 +++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index b0170a81a4..2b6c22c17c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-07-26 Collin Funk <collin.fu...@gmail.com>
+ doc: Update list of headers to use #include <...>.
+ * doc/gnulib-tool.texi (Style of #include statements): Add missing
+ headers from lib/*.in.h. Re-sort list.
+
sys_time, sys_types: Remove sys directory at 'make mostlyclean'.
* modules/sys_time (Makefile.am): Add sys to MOSTLYCLEANDIRS.
* modules/sys_types (Makefile.am): Likewise.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 0f059e1287..10e0bfa1d9 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -587,10 +587,13 @@ @node Style of #include statements
@item @code{stdalign.h}
@item @code{stdarg.h}
@item @code{stdbit.h}
+@item @code{stdbool.h}
+@item @code{stdckdint.h}
@item @code{stddef.h}
@item @code{stdint.h}
@item @code{stdio.h}
@item @code{stdlib.h}
+@item @code{stdnoreturn.h}
@item @code{string.h}
@item @code{strings.h}
@item @code{sys/msg.h}
@@ -604,6 +607,7 @@ @node Style of #include statements
@item @code{sys/times.h}
@item @code{sys/types.h}
@item @code{sys/uio.h}
+@item @code{sys/un.h}
@item @code{sys/utsname.h}
@item @code{sys/wait.h}
@item @code{termios.h}
@@ -620,17 +624,23 @@ @node Style of #include statements
but are not standardized:
@itemize @asis{}
@item @code{alloca.h}
+@item @code{argz.h}
@item @code{byteswap.h}
@item @code{error.h}
+@item @code{execinfo.h}
@item @code{getopt.h}
+@item @code{ieee754.h}
@item @code{malloc.h}
+@item @code{obstack.h}
@item @code{omp.h}
@item @code{pty.h}
+@item @code{selinux/context.h}
+@item @code{selinux/label.h}
@item @code{selinux/selinux.h}
+@item @code{sysexits.h}
@item @code{sys/file.h}
@item @code{sys/ioctl.h}
@item @code{sys/random.h}
-@item @code{sysexits.h}
@item @code{utmp.h}
@end itemize
@noindent
--
2.45.2
>From a46019c46c4cbb70b5cab8a86e14b92b09815b74 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Fri, 26 Jul 2024 21:30:56 -0700
Subject: [PATCH 2/2] maintainer-makefile: Update list of headers to use
#include <...>.
* top/maint.mk (gl_prefer_angle_bracket_headers_): Add missing headers
from lib/*.in.h. Re-sort list.
---
ChangeLog | 4 ++++
top/maint.mk | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 2b6c22c17c..d256d51400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-07-26 Collin Funk <collin.fu...@gmail.com>
+ maintainer-makefile: Update list of headers to use #include <...>.
+ * top/maint.mk (gl_prefer_angle_bracket_headers_): Add missing headers
+ from lib/*.in.h. Re-sort list.
+
doc: Update list of headers to use #include <...>.
* doc/gnulib-tool.texi (Style of #include statements): Add missing
headers from lib/*.in.h. Re-sort list.
diff --git a/top/maint.mk b/top/maint.mk
index de2aff8b9b..96796142ed 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -544,6 +544,7 @@ sc_require_config_h_first:
# sed -n -e 's/^@item[[:space:]]\{1,\}@code{\([^}]\{1,\}\)}$/\1/p' $GNULIB_SRCDIR/doc/gnulib-tool.texi | sort -u
gl_prefer_angle_bracket_headers_ ?= \
alloca.h \
+ argz.h \
arpa/inet.h \
assert.h \
byteswap.h \
@@ -552,6 +553,7 @@ gl_prefer_angle_bracket_headers_ ?= \
endian.h \
errno.h \
error.h \
+ execinfo.h \
fcntl.h \
fenv.h \
float.h \
@@ -559,6 +561,7 @@ gl_prefer_angle_bracket_headers_ ?= \
getopt.h \
glob.h \
iconv.h \
+ ieee754.h \
inttypes.h \
langinfo.h \
limits.h \
@@ -569,22 +572,28 @@ gl_prefer_angle_bracket_headers_ ?= \
netdb.h \
net/if.h \
netinet/in.h \
+ obstack.h \
omp.h \
poll.h \
pthread.h \
pty.h \
sched.h \
search.h \
+ selinux/context.h \
+ selinux/label.h \
selinux/selinux.h \
signal.h \
spawn.h \
stdalign.h \
stdarg.h \
stdbit.h \
+ stdbool.h \
+ stdckdint.h \
stddef.h \
stdint.h \
stdio.h \
stdlib.h \
+ stdnoreturn.h \
string.h \
strings.h \
sysexits.h \
@@ -602,6 +611,7 @@ gl_prefer_angle_bracket_headers_ ?= \
sys/times.h \
sys/types.h \
sys/uio.h \
+ sys/un.h \
sys/utsname.h \
sys/wait.h \
termios.h \
--
2.45.2
