From: Mikko Rapeli <mikko.rapeli@iki.fi>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org,
david.heidelberger@ixit.cz, maillist-linux@barfooze.de
Subject: Re: [PATCH 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO
Date: Mon, 13 Mar 2017 13:28:55 +0200 [thread overview]
Message-ID: <20170313112855.GA8672@lakka.kapsi.fi> (raw)
In-Reply-To: <20170312220039.16885-3-hauke@hauke-m.de>
On Sun, Mar 12, 2017 at 11:00:37PM +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>
Acked-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 7c1fead03c50..49a8cc3138ae 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
>
next prev parent reply other threads:[~2017-03-13 11:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-12 22:00 [PATCH 0/4] uapi glibc compat: fix musl libc compatibility Hauke Mehrtens
2017-03-12 22:00 ` [PATCH 1/4] uapi glibc compat: add libc compat code when not build for kernel Hauke Mehrtens
2017-03-13 11:28 ` Mikko Rapeli
2017-03-12 22:00 ` [PATCH 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO Hauke Mehrtens
2017-03-13 11:28 ` Mikko Rapeli [this message]
2017-03-12 22:00 ` [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC Hauke Mehrtens
2017-03-13 11:29 ` Mikko Rapeli
2017-03-16 7:59 ` David Woodhouse
2017-03-16 8:26 ` Mikko Rapeli
2017-03-17 18:17 ` Hauke Mehrtens
2017-03-12 22:00 ` [PATCH 4/4] uapi/if_ether.h: prevent redefinition of struct ethhdr Hauke Mehrtens
2017-03-13 11:31 ` Mikko Rapeli
2017-03-28 12:01 ` [PATCH 0/4] uapi glibc compat: fix musl libc compatibility Hauke Mehrtens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170313112855.GA8672@lakka.kapsi.fi \
--to=mikko.rapeli@iki.fi \
--cc=davem@davemloft.net \
--cc=david.heidelberger@ixit.cz \
--cc=hauke@hauke-m.de \
--cc=jarod@redhat.com \
--cc=jogo@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maillist-linux@barfooze.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).