From 909a6f10157114e09936d2dd545175d7ed84c0fb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] Add the musl workaround to the libc-compat.h copy The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and __USE_MISC) to solve conflicts with libc provided headers. This patch makes libc-compat.h work also for musl libc. Signed-off-by: Baruch Siach --- Upstream status: libc-compat.h is a local copy of a kernel headers. A proper musl fix must go to the kernel first. --- include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 9ab3ace08e2b..e768459d89f9 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */ -#if defined(__GLIBC__) +#if 1 +#define __USE_MISC /* Coordinate with glibc net/if.h header. */ #if defined(_NET_IF_H) && defined(__USE_MISC) +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 /* GLIBC headers included first so don't define anything * that would already be defined. */ -- 2.15.0