Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755656AbdDLUcU (ORCPT ); Wed, 12 Apr 2017 16:32:20 -0400 Received: from hauke-m.de ([5.39.93.123]:43950 "EHLO mail.hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755406AbdDLUb2 (ORCPT ); Wed, 12 Apr 2017 16:31:28 -0400 From: Hauke Mehrtens 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 Subject: [PATCH resend 3/4] uapi glibc compat: Do not check for __USE_MISC Date: Wed, 12 Apr 2017 22:31:02 +0200 Message-Id: <20170412203103.6057-4-hauke@hauke-m.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170412203103.6057-1-hauke@hauke-m.de> References: <20170412203103.6057-1-hauke@hauke-m.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 933 Lines: 26 __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 Signed-off-by: Hauke Mehrtens --- 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