[2c/6] Installed-header hygiene (BZ#20366): New dependencies on stdint.h after mechanical change.
Commit Message
After changing from u_intNN_t to uintNN_t, a number of headers now
need to include stdint.h to pick up those types. It might be more
hygenic, namespace-wise, to use __uintNN_t instead, but none of these
headers are bound by ISO or POSIX to do so, and it's unlikely that
anyone using them will be bothered.
Some of these files directly included features.h and/or sys/cdefs.h,
which I removed, as the style generally seems to be to let sys/types.h
do that for us. (This does not change the set of definitions exposed
by any header; sys/types.h unconditionally includes both features.h
and sys/cdefs.h.)
One file included asm/types.h unnecessarily.
* inet/protocols/talkd.h, resolv/arpa/nameser.h
* sysdeps/generic/netinet/in_systm.h
* sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
* sysdeps/gnu/netinet/udp.h
* sysdeps/unix/sysv/linux/net/ethernet.h
* sysdeps/unix/sysv/linux/net/if_arp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_shaper.h
* sysdeps/unix/sysv/linux/netinet/if_fddi.h
* sysdeps/unix/sysv/linux/netinet/if_tr.h
* sysdeps/unix/sysv/linux/netipx/ipx.h
* sysdeps/unix/sysv/linux/sys/acct.h
Include stdint.h for uintNN_t definitions.
Don't include sys/cdefs.h, features.h, or asm/types.h directly.
---
inet/protocols/talkd.h | 1 +
resolv/arpa/nameser.h | 2 +-
sysdeps/generic/netinet/in_systm.h | 2 +-
sysdeps/gnu/netinet/ip_icmp.h | 2 +-
sysdeps/gnu/netinet/tcp.h | 1 +
sysdeps/gnu/netinet/udp.h | 3 +--
sysdeps/unix/sysv/linux/net/ethernet.h | 3 ++-
sysdeps/unix/sysv/linux/net/if_arp.h | 3 +--
sysdeps/unix/sysv/linux/net/if_ppp.h | 3 +--
sysdeps/unix/sysv/linux/net/if_shaper.h | 2 +-
sysdeps/unix/sysv/linux/netinet/if_fddi.h | 4 +---
sysdeps/unix/sysv/linux/netinet/if_tr.h | 2 +-
sysdeps/unix/sysv/linux/netipx/ipx.h | 3 +--
sysdeps/unix/sysv/linux/sys/acct.h | 5 ++---
14 files changed, 16 insertions(+), 20 deletions(-)
@@ -52,6 +52,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
/*
* Client->server request message format.
@@ -50,7 +50,7 @@
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/cdefs.h>
+#include <stdint.h>
/*
* Define constants based on RFC 883, RFC 1034, RFC 1035
@@ -19,8 +19,8 @@
#ifndef _NETINET_IN_SYSTM_H
#define _NETINET_IN_SYSTM_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__BEGIN_DECLS
@@ -18,8 +18,8 @@
#ifndef __NETINET_IP_ICMP_H
#define __NETINET_IP_ICMP_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__BEGIN_DECLS
@@ -73,6 +73,7 @@
#ifdef __USE_MISC
# include <sys/types.h>
# include <sys/socket.h>
+# include <stdint.h>
typedef uint32_t tcp_seq;
/*
@@ -47,9 +47,8 @@
#ifndef __NETINET_UDP_H
#define __NETINET_UDP_H 1
-#include <features.h>
#include <sys/types.h>
-
+#include <stdint.h>
/* UDP header as specified by RFC 768, August 1980. */
@@ -21,8 +21,9 @@
#ifndef __NET_ETHERNET_H
#define __NET_ETHERNET_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
+
#include <linux/if_ether.h> /* IEEE 802.3 Ethernet constants */
__BEGIN_DECLS
@@ -20,12 +20,11 @@
/* Based on the 4.4BSD and Linux version of this file. */
#ifndef _NET_IF_ARP_H
-
#define _NET_IF_ARP_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
__BEGIN_DECLS
@@ -49,8 +49,7 @@
#define __NET_IF_PPP_H 1
#include <sys/types.h>
-#include <sys/cdefs.h>
-
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <net/ppp_defs.h>
@@ -18,8 +18,8 @@
#ifndef _NET_IF_SHAPER_H
#define _NET_IF_SHAPER_H 1
-#include <features.h>
#include <sys/types.h>
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
@@ -18,10 +18,8 @@
#ifndef _NETINET_IF_FDDI_H
#define _NETINET_IF_FDDI_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
-#include <asm/types.h>
-
+#include <stdint.h>
#include <linux/if_fddi.h>
#ifdef __USE_MISC
@@ -18,8 +18,8 @@
#ifndef _NETINET_IF_TR_H
#define _NETINET_IF_TR_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
/* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble
and FCS/CRC (frame check sequence). */
@@ -18,9 +18,8 @@
#ifndef __NETIPX_IPX_H
#define __NETIPX_IPX_H 1
-#include <features.h>
-
#include <sys/types.h>
+#include <stdint.h>
#include <bits/sockaddr.h>
__BEGIN_DECLS
@@ -18,12 +18,11 @@
#ifndef _SYS_ACCT_H
#define _SYS_ACCT_H 1
-#include <features.h>
-
+#include <sys/types.h>
+#include <stdint.h>
#include <endian.h>
#define __need_time_t
#include <time.h>
-#include <sys/types.h>
__BEGIN_DECLS