From patchwork Wed Apr 12 20:31:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 750165 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w3Fwl3tbcz9s65 for ; Thu, 13 Apr 2017 06:32:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755659AbdDLUcT (ORCPT ); Wed, 12 Apr 2017 16:32:19 -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 Received: from hauke-desktop.lan (p20030086280C66000268227B93D5563C.dip0.t-ipconnect.de [IPv6:2003:86:280c:6600:268:227b:93d5:563c]) by mail.hauke-m.de (Postfix) with ESMTPSA id 3F66110016D; Wed, 12 Apr 2017 22:31:25 +0200 (CEST) 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> X-Spam-Status: No, score=0.0 required=7.0 tests=UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on hauke-m.de Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org __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. */