about summary refs log tree commit diff
path: root/socket/sys/socket.h
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 /socket/sys/socket.h
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 'socket/sys/socket.h')
-rw-r--r--socket/sys/socket.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index c9f0f5080d..5be1b91a93 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -38,13 +38,7 @@ __BEGIN_DECLS
 #include <bits/socket.h>
 
 #ifdef __USE_MISC
-/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
-   format in the grotty old 4.3 `talk' protocol.  */
-struct osockaddr
-  {
-    unsigned short int sa_family;
-    unsigned char sa_data[14];
-  };
+# include <bits/types/struct_osockaddr.h>
 #endif
 
 /* The following constants should be used for the second parameter of