diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-05-19 17:26:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-20 19:57:22 -0400 |
| commit | f0a3fdca794d1e68ae284ef4caefe681f7c18e89 (patch) | |
| tree | 2bd6f8189b1d966f0b5eae43074989a15c0f47b8 /include/uapi/linux/libc-compat.h | |
| parent | e5aed006be918af163eb397e45aa5ea6cefd5e01 (diff) | |
| download | talos-op-linux-f0a3fdca794d1e68ae284ef4caefe681f7c18e89.tar.gz talos-op-linux-f0a3fdca794d1e68ae284ef4caefe681f7c18e89.zip | |
uapi glibc compat: fix compilation when !__USE_MISC in glibc
These structures are defined only if __USE_MISC is set in glibc net/if.h
headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined.
CC: Jan Engelhardt <jengelh@inai.de>
CC: Josh Boyer <jwboyer@fedoraproject.org>
CC: Stephen Hemminger <shemming@brocade.com>
CC: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
CC: Gabriel Laskar <gabriel@lse.epita.fr>
CC: Mikko Rapeli <mikko.rapeli@iki.fi>
Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/libc-compat.h')
| -rw-r--r-- | include/uapi/linux/libc-compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index d5e38c73377c..e4f048ee7043 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -52,7 +52,7 @@ #if defined(__GLIBC__) /* Coordinate with glibc net/if.h header. */ -#if defined(_NET_IF_H) +#if defined(_NET_IF_H) && defined(__USE_MISC) /* GLIBC headers included first so don't define anything * that would already be defined. */ |
