diff options
| author | Zack Weinberg <zackw@panix.com> | 2016-07-13 15:20:29 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2016-09-23 08:43:56 -0400 |
| commit | f2bea4da2e65b5d91a23a01fb2062bcec33974aa (patch) | |
| tree | 466d8cc7eb9f7baa3a54a3aed84c12264d40bceb /inet | |
| parent | 11160cb76f56e0a711686e34881a4eaf1ad2fa0e (diff) | |
| download | glibc-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 'inet')
| -rw-r--r-- | inet/netinet/ether.h | 2 | ||||
| -rw-r--r-- | inet/protocols/talkd.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/inet/netinet/ether.h b/inet/netinet/ether.h index 3dff523b2f..0952b23f97 100644 --- a/inet/netinet/ether.h +++ b/inet/netinet/ether.h @@ -24,6 +24,7 @@ /* Get definition of `struct ether_addr'. */ #include <netinet/if_ether.h> +#ifdef __USE_MISC __BEGIN_DECLS /* Convert 48 bit Ethernet ADDRess to ASCII. */ @@ -49,5 +50,6 @@ extern int ether_line (const char *__line, struct ether_addr *__addr, char *__hostname) __THROW; __END_DECLS +#endif /* Use misc. */ #endif /* netinet/ether.h */ diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h index 34e2654cfc..09bd8a90ba 100644 --- a/inet/protocols/talkd.h +++ b/inet/protocols/talkd.h @@ -53,6 +53,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <stdint.h> +#include <bits/types/struct_osockaddr.h> /* * Client->server request message format. |