[glibc/zack/no-nested-includes] Clarify status of wait.h and sys/bitypes.h

[glibc/zack/no-nested-includes] Clarify status of wait.h and sys/bitypes.h

[Zack Weinberg]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1ec7ee5e3e185485b43b72c43d9ca703a0de0ef

commit a1ec7ee5e3e185485b43b72c43d9ca703a0de0ef
Author: Zack Weinberg <zackw@panix.com>
Date:   Sun May 26 12:31:23 2019 -0400

    Clarify status of wait.h and sys/bitypes.h
    
    These headers are like sys/poll.h and sys/syslog.h: they are backward
    compatibility names for other headers.  Clarify this by adjusting their
    position within the HEADER_ALLOWED_INCLUDES table.
    
    	* scripts/check-obsolete-constructs.py (HEADER_ALLOWED_INCLUDES):
    	Move entries for sys/bitypes.h and wait.h next to entries for
    	sys/poll.h and sys/syslog.h, and update the commentary for that
    	group of headers.

Diff:
---
 scripts/check-obsolete-constructs.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py
index 6907c26..e2ca8f5 100755
--- a/scripts/check-obsolete-constructs.py
+++ b/scripts/check-obsolete-constructs.py
@@ -585,11 +585,9 @@ HEADER_ALLOWED_INCLUDES = {
     "ucontext.h":                  [ "sys/ucontext.h" ],
     "utmp.h":                      [ "paths.h" ],
     "values.h":                    [ "float.h", "limits.h" ],
-    "wait.h":                      [ "sys/wait.h" ],
 
     # Nonstandardized sys/ headers
     "sys/auxv.h":                  [ "elf.h" ],
-    "sys/bitypes.h":               [ "sys/types.h" ],
     "sys/dir.h":                   [ "dirent.h" ],
     "sys/elf.h":                   [ "sys/procfs.h" ],
     "sys/errno.h":                 [ "errno.h" ],
@@ -619,11 +617,14 @@ HEADER_ALLOWED_INCLUDES = {
     "sys/vfs.h":                   [ "sys/statfs.h" ],
     "sys/xattr.h":                 [ "sys/types.h" ],
 
-    # Nonstandardized sys/ headers that do nothing but include a
-    # top-level header with the same name.  These exist for
-    # compatibility with old systems that only had the sys/ name.
+    # Nonstandardized headers that do nothing but include some other
+    # header.  These exist for compatibility with old systems where
+    # the included header did not exist or didn't provide all the
+    # necessary definitions.
+    "sys/bitypes.h":               [ "sys/types.h" ],
     "sys/poll.h":                  [ "poll.h" ],
     "sys/syslog.h":                [ "syslog.h" ],
+    "wait.h":                      [ "sys/wait.h" ],
 
     # Nonstandardized networking headers
     "ifaddrs.h":                   [ "sys/socket.h" ],

[glibc/zack/no-nested-includes] Clarify status of wait.h and sys/bitypes.h

[Zack Weinberg]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5e0a3b437d8cf30215017bd03567f6892abea8bb

commit 5e0a3b437d8cf30215017bd03567f6892abea8bb
Author: Zack Weinberg <zackw@panix.com>
Date:   Sun May 26 12:31:23 2019 -0400

    Clarify status of wait.h and sys/bitypes.h
    
    These headers are like sys/poll.h and sys/syslog.h: they are backward
    compatibility names for other headers.  Clarify this by adjusting their
    position within the HEADER_ALLOWED_INCLUDES table.
    
    	* scripts/check-obsolete-constructs.py (HEADER_ALLOWED_INCLUDES):
    	Move entries for sys/bitypes.h and wait.h next to entries for
    	sys/poll.h and sys/syslog.h, and update the commentary for that
    	group of headers.

Diff:
---
 scripts/check-obsolete-constructs.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py
index 6907c26..e2ca8f5 100755
--- a/scripts/check-obsolete-constructs.py
+++ b/scripts/check-obsolete-constructs.py
@@ -585,11 +585,9 @@ HEADER_ALLOWED_INCLUDES = {
     "ucontext.h":                  [ "sys/ucontext.h" ],
     "utmp.h":                      [ "paths.h" ],
     "values.h":                    [ "float.h", "limits.h" ],
-    "wait.h":                      [ "sys/wait.h" ],
 
     # Nonstandardized sys/ headers
     "sys/auxv.h":                  [ "elf.h" ],
-    "sys/bitypes.h":               [ "sys/types.h" ],
     "sys/dir.h":                   [ "dirent.h" ],
     "sys/elf.h":                   [ "sys/procfs.h" ],
     "sys/errno.h":                 [ "errno.h" ],
@@ -619,11 +617,14 @@ HEADER_ALLOWED_INCLUDES = {
     "sys/vfs.h":                   [ "sys/statfs.h" ],
     "sys/xattr.h":                 [ "sys/types.h" ],
 
-    # Nonstandardized sys/ headers that do nothing but include a
-    # top-level header with the same name.  These exist for
-    # compatibility with old systems that only had the sys/ name.
+    # Nonstandardized headers that do nothing but include some other
+    # header.  These exist for compatibility with old systems where
+    # the included header did not exist or didn't provide all the
+    # necessary definitions.
+    "sys/bitypes.h":               [ "sys/types.h" ],
     "sys/poll.h":                  [ "poll.h" ],
     "sys/syslog.h":                [ "syslog.h" ],
+    "wait.h":                      [ "sys/wait.h" ],
 
     # Nonstandardized networking headers
     "ifaddrs.h":                   [ "sys/socket.h" ],