about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/net
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2016-07-13 15:20:29 -0400
committerZack Weinberg <zackw@panix.com>2016-09-23 08:43:56 -0400
commitf2bea4da2e65b5d91a23a01fb2062bcec33974aa (patch)
tree466d8cc7eb9f7baa3a54a3aed84c12264d40bceb /sysdeps/unix/sysv/linux/net
parent11160cb76f56e0a711686e34881a4eaf1ad2fa0e (diff)
downloadglibc-f2bea4da2e65b5d91a23a01fb2062bcec33974aa.tar.gz
glibc-f2bea4da2e65b5d91a23a01fb2062bcec33974aa.tar.xz
glibc-f2bea4da2e65b5d91a23a01fb2062bcec33974aa.zip
Installed-header hygiene (BZ#20366): conditionally defined structures.
Several network-related structures are defined conditionally under
__USE_MISC, but unconditionally used by other headers.  The path of
least resistance is usually to condition the uses on __USE_MISC as
well.

	* sysdeps/mach/hurd/net/if_ppp.h
	* sysdeps/unix/sysv/linux/net/if_ppp.h:
        Only define struct ifpppstatsreq and struct ifpppcstatsreq
        if __USE_MISC is defined, to ensure struct ifreq is declared.

	* inet/netinet/ether.h: Condition all function prototypes
        on __USE_MISC, to ensure struct ether_addr is declared.

sys/socket.h defines struct osockaddr only under __USE_MISC, whereas
protocols/talkd.h requires it unconditionally.  Here it doesn't make
sense to condition the entire body of protocols/talkd.h on __USE_MISC.
Rather than complicate sys/socket.h with a __need macro or duplicate
the definition, I am introducing a new concept: tiny headers named
bits/types/TYPE.h that define TYPE and nothing else.  This can, I hope,
ultimately replace *all* the __need macros.  The guard macro for such
headers will be __TYPE_defined, just in case application or third-party
library code is looking at them.

	* socket/bits/types/struct_osockaddr.h: New header.
	* include/bits/types/struct_osockaddr.h: New wrapper.
	* socket/Makefile: Install the new header.
	* socket/sys/socket.h,  inet/protocols/talkd.h:
	Refer to bits/types/struct_osockaddr.h for the definition of
	struct osockaddr.
Diffstat (limited to 'sysdeps/unix/sysv/linux/net')
-rw-r--r--sysdeps/unix/sysv/linux/net/if_ppp.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/net/if_ppp.h b/sysdeps/unix/sysv/linux/net/if_ppp.h
index 9994982fc0..31a20766f0 100644
--- a/sysdeps/unix/sysv/linux/net/if_ppp.h
+++ b/sysdeps/unix/sysv/linux/net/if_ppp.h
@@ -118,6 +118,8 @@ struct ppp_option_data {
 	int	 transmit;
 };
 
+/* 'struct ifreq' is only available from net/if.h under __USE_MISC.  */
+#ifdef __USE_MISC
 struct ifpppstatsreq {
   struct ifreq	   b;
   struct ppp_stats stats;			/* statistic information */
@@ -130,6 +132,7 @@ struct ifpppcstatsreq {
 
 #define ifr__name       b.ifr_ifrn.ifrn_name
 #define stats_ptr       b.ifr_ifru.ifru_data
+#endif
 
 /*
  * Ioctl definitions.