Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbdCMLaM (ORCPT ); Mon, 13 Mar 2017 07:30:12 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:44333 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbdCMLaC (ORCPT ); Mon, 13 Mar 2017 07:30:02 -0400 Date: Mon, 13 Mar 2017 13:29:58 +0200 From: Mikko Rapeli To: Hauke Mehrtens Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org, david.heidelberger@ixit.cz, maillist-linux@barfooze.de Subject: Re: [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC Message-ID: <20170313112958.GB8672@lakka.kapsi.fi> References: <20170312220039.16885-1-hauke@hauke-m.de> <20170312220039.16885-4-hauke@hauke-m.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170312220039.16885-4-hauke@hauke-m.de> X-SA-Exim-Connect-IP: 2001:1bc8:1004::1 X-SA-Exim-Mail-From: mikko.rapeli@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1050 Lines: 30 On Sun, Mar 12, 2017 at 11:00:38PM +0100, Hauke Mehrtens wrote: > __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. > Signed-off-by: Hauke Mehrtens Acked-by: Mikko Rapeli > --- > 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 >