From f2bea4da2e65b5d91a23a01fb2062bcec33974aa Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 13 Jul 2016 15:20:29 -0400 Subject: 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. --- ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 81456f80d0..60500b47c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2016-09-23 Zack Weinberg + + * 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. + + * 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. + 2016-09-23 Zack Weinberg * bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h -- cgit v1.2.3