* [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO
@ 2017-01-21 16:26 Hauke Mehrtens
2017-01-21 17:03 ` Mikko Rapeli
0 siblings, 1 reply; 2+ messages in thread
From: Hauke Mehrtens @ 2017-01-21 16:26 UTC (permalink / raw)
To: nicolas.dichtel, davem, mikko.rapeli; +Cc: linux-kernel, Hauke Mehrtens
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO
2017-01-21 16:26 [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO Hauke Mehrtens
@ 2017-01-21 17:03 ` Mikko Rapeli
0 siblings, 0 replies; 2+ messages in thread
From: Mikko Rapeli @ 2017-01-21 17:03 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: nicolas.dichtel, davem, linux-kernel
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-21 17:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-21 16:26 [PATCH] uapi glibc compat: fix build if libc defines IFF_ECHO Hauke Mehrtens
2017-01-21 17:03 ` Mikko Rapeli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome