projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5aed00
)
uapi glibc compat: fix compilation when !__USE_MISC in glibc
author
Nicolas Dichtel
<
[email protected]
>
Thu, 19 May 2016 15:26:29 +0000
(17:26 +0200)
committer
David S. Miller
<
[email protected]
>
Fri, 20 May 2016 23:57:22 +0000
(19:57 -0400)
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 <
[email protected]
>
CC: Josh Boyer <
[email protected]
>
CC: Stephen Hemminger <
[email protected]
>
CC: Waldemar Brodkorb <
[email protected]
>
CC: Gabriel Laskar <
[email protected]
>
CC: Mikko Rapeli <
[email protected]
>
Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Nicolas Dichtel <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/uapi/linux/libc-compat.h
patch
|
blob
|
history
diff --git
a/include/uapi/linux/libc-compat.h
b/include/uapi/linux/libc-compat.h
index d5e38c73377c05fa44607bffe8bfb01112330706..e4f048ee7043d196a0948c9dfc520b78082c6e54 100644
(file)
--- 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. */