From: Hauke Mehrtens <hauke@hauke-m.de>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org,
david.heidelberger@ixit.cz, maillist-linux@barfooze.de,
mikko.rapeli@iki.fi, dwmw2@infradead.org,
Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH resend 3/4] uapi glibc compat: Do not check for __USE_MISC
Date: Wed, 12 Apr 2017 22:31:02 +0200 [thread overview]
Message-ID: <20170412203103.6057-4-hauke@hauke-m.de> (raw)
In-Reply-To: <20170412203103.6057-1-hauke@hauke-m.de>
__USE_MISC is glibc specific and not available in musl libc. Only do
this check when glibc is used. This fixes a problem with musl libc.
Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/uapi/linux/libc-compat.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index 49a8cc3138ae..ce2fa8a4ced6 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -51,8 +51,8 @@
/* We have included libc headers... */
#if !defined(__KERNEL__)
-/* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H) && defined(__USE_MISC)
+/* Coordinate with libc net/if.h header. */
+#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC))
/* GLIBC headers included first so don't define anything
* that would already be defined. */
--
2.11.0
next prev parent reply other threads:[~2017-04-12 20:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 20:30 [PATCH resend 0/4] uapi glibc compat: fix musl libc compatibility Hauke Mehrtens
2017-04-12 20:31 ` [PATCH resend 1/4] uapi glibc compat: add libc compat code when not build for kernel Hauke Mehrtens
2017-04-13 10:35 ` Sergei Shtylyov
2017-04-12 20:31 ` [PATCH resend 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO Hauke Mehrtens
2017-04-12 20:31 ` Hauke Mehrtens [this message]
2017-04-17 16:55 ` [PATCH resend 3/4] uapi glibc compat: Do not check for __USE_MISC David Miller
2017-04-12 20:31 ` [PATCH resend 4/4] uapi/if_ether.h: prevent redefinition of struct ethhdr 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=20170412203103.6057-4-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=davem@davemloft.net \
--cc=david.heidelberger@ixit.cz \
--cc=dwmw2@infradead.org \
--cc=jarod@redhat.com \
--cc=jogo@openwrt.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maillist-linux@barfooze.de \
--cc=mikko.rapeli@iki.fi \
--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