projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 105b4da3 GKH |
1 | From foo@baz Fri Jun 17 11:18:18 PDT 2016 |
| 2 | From: Nicolas Dichtel <nicolas.dichtel@6wind.com> | |
| 3 | Date: Thu, 19 May 2016 17:26:29 +0200 | |
| 4 | Subject: uapi glibc compat: fix compilation when !__USE_MISC in glibc | |
| 5 | ||
| 6 | From: Nicolas Dichtel <nicolas.dichtel@6wind.com> | |
| 7 | ||
| 8 | [ Upstream commit f0a3fdca794d1e68ae284ef4caefe681f7c18e89 ] | |
| 9 | ||
| 10 | These structures are defined only if __USE_MISC is set in glibc net/if.h | |
| 11 | headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined. | |
| 12 | ||
| 13 | CC: Jan Engelhardt <jengelh@inai.de> | |
| 14 | CC: Josh Boyer <jwboyer@fedoraproject.org> | |
| 15 | CC: Stephen Hemminger <shemming@brocade.com> | |
| 16 | CC: Waldemar Brodkorb <mail@waldemar-brodkorb.de> | |
| 17 | CC: Gabriel Laskar <gabriel@lse.epita.fr> | |
| 18 | CC: Mikko Rapeli <mikko.rapeli@iki.fi> | |
| 19 | Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h") | |
| 20 | Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> | |
| 21 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 22 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 23 | --- | |
| 24 | include/uapi/linux/libc-compat.h | 2 +- | |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 26 | ||
| 27 | --- a/include/uapi/linux/libc-compat.h | |
| 28 | +++ b/include/uapi/linux/libc-compat.h | |
| 29 | @@ -52,7 +52,7 @@ | |
| 30 | #if defined(__GLIBC__) | |
| 31 | ||
| 32 | /* Coordinate with glibc net/if.h header. */ | |
| 33 | -#if defined(_NET_IF_H) | |
| 34 | +#if defined(_NET_IF_H) && defined(__USE_MISC) | |
| 35 | ||
| 36 | /* GLIBC headers included first so don't define anything | |
| 37 | * that would already be defined. */ |