From patchwork Tue Aug 30 01:16:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 15045 Received: (qmail 23386 invoked by alias); 30 Aug 2016 01:16:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 23358 invoked by uid 89); 30 Aug 2016 01:16:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*MI:sk:2016083, Select, udp, UD:features.h X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Cc: joseph@codesourcery.com Subject: [PATCH 03/13] Installed-header hygiene (BZ#20366): missing inclusions A. Date: Mon, 29 Aug 2016 21:16:35 -0400 Message-Id: <20160830011645.25769-4-zackw@panix.com> In-Reply-To: <20160830011645.25769-3-zackw@panix.com> References: <20160830011645.25769-1-zackw@panix.com> <20160830011645.25769-2-zackw@panix.com> <20160830011645.25769-3-zackw@panix.com> MIME-Version: 1.0 These are all fallout from the change from u_intNN_t to uintNN_t; a number of headers now need to include to pick up those types. It is possible that __uintNN_t should be used instead. Some of these files directly included and/or , which I removed, as the style generally seems to be to let do that for us. One file included gratuitously. * 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 * sysdeps/unix/sysv/linux/sys/quota.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 ++--- sysdeps/unix/sysv/linux/sys/quota.h | 2 +- 15 files changed, 17 insertions(+), 21 deletions(-) diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h index 0437ae4..34e2654 100644 --- a/inet/protocols/talkd.h +++ b/inet/protocols/talkd.h @@ -52,6 +52,7 @@ #include #include +#include /* * Client->server request message format. diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 47240c7..62c11e0 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -58,7 +58,7 @@ #include #include -#include +#include /*% * Revision information. This is the release date in YYYYMMDD format. diff --git a/sysdeps/generic/netinet/in_systm.h b/sysdeps/generic/netinet/in_systm.h index 1629c36..7b9a92b 100644 --- a/sysdeps/generic/netinet/in_systm.h +++ b/sysdeps/generic/netinet/in_systm.h @@ -19,8 +19,8 @@ #ifndef _NETINET_IN_SYSTM_H #define _NETINET_IN_SYSTM_H 1 -#include #include +#include __BEGIN_DECLS diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h index e57b144..542e789 100644 --- a/sysdeps/gnu/netinet/ip_icmp.h +++ b/sysdeps/gnu/netinet/ip_icmp.h @@ -18,8 +18,8 @@ #ifndef __NETINET_IP_ICMP_H #define __NETINET_IP_ICMP_H 1 -#include #include +#include __BEGIN_DECLS diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h index 42ec108..3fbea54 100644 --- a/sysdeps/gnu/netinet/tcp.h +++ b/sysdeps/gnu/netinet/tcp.h @@ -73,6 +73,7 @@ #ifdef __USE_MISC # include # include +# include typedef uint32_t tcp_seq; /* diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h index f55391c..d5f60e4 100644 --- a/sysdeps/gnu/netinet/udp.h +++ b/sysdeps/gnu/netinet/udp.h @@ -47,9 +47,8 @@ #ifndef __NETINET_UDP_H #define __NETINET_UDP_H 1 -#include #include - +#include /* UDP header as specified by RFC 768, August 1980. */ diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h index 56b3276..833473e 100644 --- a/sysdeps/unix/sysv/linux/net/ethernet.h +++ b/sysdeps/unix/sysv/linux/net/ethernet.h @@ -21,8 +21,9 @@ #ifndef __NET_ETHERNET_H #define __NET_ETHERNET_H 1 -#include #include +#include + #include /* IEEE 802.3 Ethernet constants */ __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h index 93758c8..9a20c83 100644 --- a/sysdeps/unix/sysv/linux/net/if_arp.h +++ b/sysdeps/unix/sysv/linux/net/if_arp.h @@ -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 #include #include +#include __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/net/if_ppp.h b/sysdeps/unix/sysv/linux/net/if_ppp.h index 20310eb..9994982 100644 --- a/sysdeps/unix/sysv/linux/net/if_ppp.h +++ b/sysdeps/unix/sysv/linux/net/if_ppp.h @@ -49,8 +49,7 @@ #define __NET_IF_PPP_H 1 #include -#include - +#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/net/if_shaper.h b/sysdeps/unix/sysv/linux/net/if_shaper.h index 4a777d8..e318794 100644 --- a/sysdeps/unix/sysv/linux/net/if_shaper.h +++ b/sysdeps/unix/sysv/linux/net/if_shaper.h @@ -18,8 +18,8 @@ #ifndef _NET_IF_SHAPER_H #define _NET_IF_SHAPER_H 1 -#include #include +#include #include #include diff --git a/sysdeps/unix/sysv/linux/netinet/if_fddi.h b/sysdeps/unix/sysv/linux/netinet/if_fddi.h index 877f738..6758014 100644 --- a/sysdeps/unix/sysv/linux/netinet/if_fddi.h +++ b/sysdeps/unix/sysv/linux/netinet/if_fddi.h @@ -18,10 +18,8 @@ #ifndef _NETINET_IF_FDDI_H #define _NETINET_IF_FDDI_H 1 -#include #include -#include - +#include #include #ifdef __USE_MISC diff --git a/sysdeps/unix/sysv/linux/netinet/if_tr.h b/sysdeps/unix/sysv/linux/netinet/if_tr.h index 5df2206..814a35d 100644 --- a/sysdeps/unix/sysv/linux/netinet/if_tr.h +++ b/sysdeps/unix/sysv/linux/netinet/if_tr.h @@ -18,8 +18,8 @@ #ifndef _NETINET_IF_TR_H #define _NETINET_IF_TR_H 1 -#include #include +#include /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble and FCS/CRC (frame check sequence). */ diff --git a/sysdeps/unix/sysv/linux/netipx/ipx.h b/sysdeps/unix/sysv/linux/netipx/ipx.h index 1d6cb78..338aab5 100644 --- a/sysdeps/unix/sysv/linux/netipx/ipx.h +++ b/sysdeps/unix/sysv/linux/netipx/ipx.h @@ -18,9 +18,8 @@ #ifndef __NETIPX_IPX_H #define __NETIPX_IPX_H 1 -#include - #include +#include #include __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h index c629ad4..d24c2a7 100644 --- a/sysdeps/unix/sysv/linux/sys/acct.h +++ b/sysdeps/unix/sysv/linux/sys/acct.h @@ -18,12 +18,11 @@ #ifndef _SYS_ACCT_H #define _SYS_ACCT_H 1 -#include - +#include +#include #include #define __need_time_t #include -#include __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/quota.h b/sysdeps/unix/sysv/linux/sys/quota.h index d675664..3e6b4ba 100644 --- a/sysdeps/unix/sysv/linux/sys/quota.h +++ b/sysdeps/unix/sysv/linux/sys/quota.h @@ -35,8 +35,8 @@ #ifndef _SYS_QUOTA_H #define _SYS_QUOTA_H 1 -#include #include +#include /* * Select between different incompatible quota versions.