From: Zack Weinberg <zackw@panix.com>
To: libc-alpha@sourceware.org
Cc: joseph@codesourcery.com
Subject: [PATCH 03/13] Installed-header hygiene (BZ#20366): missing inclusions A.
Date: Tue, 30 Aug 2016 01:17:00 -0000 [thread overview]
Message-ID: <20160830011645.25769-4-zackw@panix.com> (raw)
In-Reply-To: <20160830011645.25769-3-zackw@panix.com>
These are all fallout from the change from u_intNN_t to uintNN_t; a
number of headers now need to include <stdint.h> to pick up those
types. It is possible that __uintNN_t should be used instead.
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. One file included <asm/types.h>
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 <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
/*
* 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 <sys/param.h>
#include <sys/types.h>
-#include <sys/cdefs.h>
+#include <stdint.h>
/*%
* 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 <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__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 <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__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 <sys/types.h>
# include <sys/socket.h>
+# include <stdint.h>
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 <features.h>
#include <sys/types.h>
-
+#include <stdint.h>
/* 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 <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
+
#include <linux/if_ether.h> /* 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 <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
__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 <sys/types.h>
-#include <sys/cdefs.h>
-
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <net/ppp_defs.h>
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 <features.h>
#include <sys/types.h>
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
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 <sys/cdefs.h>
#include <sys/types.h>
-#include <asm/types.h>
-
+#include <stdint.h>
#include <linux/if_fddi.h>
#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 <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). */
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 <features.h>
-
#include <sys/types.h>
+#include <stdint.h>
#include <bits/sockaddr.h>
__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 <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
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 <features.h>
#include <sys/types.h>
+#include <stdint.h>
/*
* Select between different incompatible quota versions.
--
2.9.3
next prev parent reply other threads:[~2016-08-30 1:16 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-30 1:17 [PATCH 00/13] Installed-header hygiene (BZ#20366) Zack Weinberg
2016-08-30 1:17 ` [PATCH 01/13] Installed-header hygiene (BZ#20366): obsolete BSD u_* types Zack Weinberg
2016-08-30 1:17 ` [PATCH 02/13] Installed-header hygiene (BZ#20366): manual fixups after mechanical change Zack Weinberg
2016-08-30 1:17 ` Zack Weinberg [this message]
2016-08-30 1:16 ` [PATCH 04/13] Installed-header hygiene (BZ#20366): missing inclusions B Zack Weinberg
2016-08-30 1:16 ` [PATCH 05/13] Installed header hygiene (BZ#20366): BYTE_ORDER macros Zack Weinberg
2016-08-30 1:17 ` [PATCH 06/13] Installed header hygiene (BZ#20366): Macros used in #if without checking whether they are defined Zack Weinberg
2016-08-30 1:17 ` [PATCH 07/13] Installed-header hygiene (BZ#20366): stack_t Zack Weinberg
2016-08-30 1:36 ` [PATCH 08/13] Installed-header hygiene (BZ#20366): time.h types Zack Weinberg
2016-08-30 1:17 ` [PATCH 09/13] Installed-header hygiene (BZ#20366): struct ifreq Zack Weinberg
2016-08-30 1:17 ` [PATCH 10/13] Installed-header hygiene (BZ#20366): struct ether_addr Zack Weinberg
2016-08-30 1:36 ` [PATCH 11/13] Installed-header hygiene (BZ#20366): struct osockaddr Zack Weinberg
2016-08-30 1:17 ` [PATCH 12/13] Installed-header hygiene (BZ#20366): Miscellaneous Zack Weinberg
2016-08-30 1:17 ` [PATCH 13/13] Installed header hygiene (BZ#20366): Test of installed headers Zack Weinberg
2016-08-30 1:28 ` Joseph Myers
2016-08-30 3:12 ` Zack Weinberg
2016-09-22 12:20 ` Zack Weinberg
2016-09-21 20:12 ` Carlos O'Donell
2016-09-21 19:53 ` [PATCH 12/13] Installed-header hygiene (BZ#20366): Miscellaneous Carlos O'Donell
2016-09-21 19:27 ` [PATCH 11/13] Installed-header hygiene (BZ#20366): struct osockaddr Carlos O'Donell
2016-09-21 19:26 ` [PATCH 10/13] Installed-header hygiene (BZ#20366): struct ether_addr Carlos O'Donell
2016-09-21 19:51 ` Carlos O'Donell
2016-09-21 20:33 ` Zack Weinberg
2016-09-21 19:15 ` [PATCH 09/13] Installed-header hygiene (BZ#20366): struct ifreq Carlos O'Donell
2016-08-30 17:10 ` [PATCH 08/13] Installed-header hygiene (BZ#20366): time.h types Joseph Myers
2016-09-21 19:04 ` Carlos O'Donell
2016-09-21 19:12 ` Zack Weinberg
2016-09-21 19:50 ` Carlos O'Donell
2016-09-21 19:50 ` [PATCH 07/13] Installed-header hygiene (BZ#20366): stack_t Carlos O'Donell
2016-09-21 18:02 ` [PATCH 06/13] Installed header hygiene (BZ#20366): Macros used in #if without checking whether they are defined Carlos O'Donell
2016-09-21 18:05 ` Joseph Myers
2016-09-21 18:41 ` Carlos O'Donell
2016-09-21 18:47 ` Paul Eggert
2016-09-21 19:09 ` Carlos O'Donell
2016-09-21 19:59 ` Joseph Myers
2016-09-21 20:24 ` Carlos O'Donell
2016-09-21 18:09 ` Zack Weinberg
2016-09-21 17:56 ` [PATCH 05/13] Installed header hygiene (BZ#20366): BYTE_ORDER macros Carlos O'Donell
2016-09-21 17:52 ` [PATCH 04/13] Installed-header hygiene (BZ#20366): missing inclusions B Carlos O'Donell
2016-08-30 1:23 ` [PATCH 03/13] Installed-header hygiene (BZ#20366): missing inclusions A Joseph Myers
2016-08-30 3:12 ` Zack Weinberg
2016-09-21 17:54 ` Carlos O'Donell
2016-09-21 17:52 ` Carlos O'Donell
2016-09-21 17:58 ` Joseph Myers
2016-09-21 18:22 ` Zack Weinberg
2016-09-21 18:43 ` Carlos O'Donell
2016-09-21 17:43 ` [PATCH 02/13] Installed-header hygiene (BZ#20366): manual fixups after mechanical change Carlos O'Donell
2016-08-30 1:22 ` [PATCH 01/13] Installed-header hygiene (BZ#20366): obsolete BSD u_* types Joseph Myers
2016-08-30 3:12 ` Zack Weinberg
2016-08-30 17:10 ` Joseph Myers
2016-09-21 17:41 ` Carlos O'Donell
2016-08-30 1:26 ` [PATCH 00/13] Installed-header hygiene (BZ#20366) Joseph Myers
2016-08-30 3:12 ` Zack Weinberg
2016-08-30 7:51 ` Andreas Schwab
2016-09-06 17:10 ` Zack Weinberg
2016-09-21 14:22 ` Zack Weinberg
2016-09-21 17:34 ` Carlos O'Donell
2016-09-21 17:52 ` Carlos O'Donell
2016-09-21 18:05 ` Zack Weinberg
2016-09-21 18:08 ` Joseph Myers
2016-09-21 18:10 ` Zack Weinberg
2016-09-21 18:46 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160830011645.25769-4-zackw@panix.com \
--to=zackw@panix.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).