[PATCH resend 3/4] uapi glibc compat: Do not check for __USE_MISC
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: 2017-04-12 20:32:20
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
__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 <redacted> 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