Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1564151 > unrolled thread
| Started by | Hauke Mehrtens <hauke@hauke-m.de> |
|---|---|
| First post | 2017-01-21 17:30 +0100 |
| Last post | 2017-01-21 18:10 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO Hauke Mehrtens <hauke@hauke-m.de> - 2017-01-21 17:30 +0100
Re: [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO Mikko Rapeli <mikko.rapeli@iki.fi> - 2017-01-21 18:10 +0100
| From | Hauke Mehrtens <hauke@hauke-m.de> |
|---|---|
| Date | 2017-01-21 17:30 +0100 |
| Subject | [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO |
| Message-ID | <t26Ia-68U-5@gated-at.bofh.it> |
musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. When a user application includes linux/if.h and net/if.h the compile will fail. Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when it is needed. This should also make this work in case glibc will add these defines. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- include/uapi/linux/libc-compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 44b8a6bd5fe1..dbf16a3de4d2 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -64,9 +64,11 @@ /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ +#ifndef IFF_ECHO #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ +#endif /* IFF_ECHO */ #else /* _NET_IF_H */ -- 2.11.0
[toc] | [next] | [standalone]
| From | Mikko Rapeli <mikko.rapeli@iki.fi> |
|---|---|
| Date | 2017-01-21 18:10 +0100 |
| Message-ID | <t27kS-6B1-19@gated-at.bofh.it> |
| In reply to | #1564151 |
Hi, Cc'ing netdev@vger.kernel.org. On Sat, Jan 21, 2017 at 05:26:54PM +0100, Hauke Mehrtens wrote: > musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. > When a user application includes linux/if.h and net/if.h the compile > will fail. > > Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when > it is needed. This should also make this work in case glibc will add > these defines. > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Looks good. Reviewed-by: Mikko Rapeli <mikko.rapeli@iki.fi> > --- > include/uapi/linux/libc-compat.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h > index 44b8a6bd5fe1..dbf16a3de4d2 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -64,9 +64,11 @@ > /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 > /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ > +#ifndef IFF_ECHO > #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 > #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ > +#endif /* IFF_ECHO */ > > #else /* _NET_IF_H */ > > -- > 2.11.0 >
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web