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 1/4] uapi glibc compat: add libc compat code when not build for kernel
Date: Wed, 12 Apr 2017 22:31:00 +0200 [thread overview]
Message-ID: <20170412203103.6057-2-hauke@hauke-m.de> (raw)
In-Reply-To: <20170412203103.6057-1-hauke@hauke-m.de>
Instead of checking if this header file is used in the glibc, check if
iti is not used in kernel context, this way it will also work with
other libc implementations like musl.
Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
include/uapi/linux/libc-compat.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index 44b8a6bd5fe1..7c1fead03c50 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -48,8 +48,8 @@
#ifndef _UAPI_LIBC_COMPAT_H
#define _UAPI_LIBC_COMPAT_H
-/* We have included glibc headers... */
-#if defined(__GLIBC__)
+/* We have included libc headers... */
+#if !defined(__KERNEL__)
/* Coordinate with glibc net/if.h header. */
#if defined(_NET_IF_H) && defined(__USE_MISC)
@@ -168,7 +168,7 @@
/* If we did not see any headers from any supported C libraries,
* or we are being included in the kernel, then define everything
* that we need. */
-#else /* !defined(__GLIBC__) */
+#else /* defined(__KERNEL__) */
/* Definitions for if.h */
#define __UAPI_DEF_IF_IFCONF 1
@@ -208,6 +208,6 @@
/* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1
-#endif /* __GLIBC__ */
+#endif /* __KERNEL__ */
#endif /* _UAPI_LIBC_COMPAT_H */
--
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 ` Hauke Mehrtens [this message]
2017-04-13 10:35 ` [PATCH resend 1/4] uapi glibc compat: add libc compat code when not build for kernel 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 ` [PATCH resend 3/4] uapi glibc compat: Do not check for __USE_MISC Hauke Mehrtens
2017-04-17 16:55 ` 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-2-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