From patchwork Wed Apr 12 20:31:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 750163 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 3w3Fvn62JRz9s65 for ; Thu, 13 Apr 2017 06:32:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755462AbdDLUb2 (ORCPT ); Wed, 12 Apr 2017 16:31:28 -0400 Received: from hauke-m.de ([5.39.93.123]:43927 "EHLO mail.hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754675AbdDLUb0 (ORCPT ); Wed, 12 Apr 2017 16:31:26 -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 B82C410008F; Wed, 12 Apr 2017 22:31:23 +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 1/4] uapi glibc compat: add libc compat code when not build for kernel Date: Wed, 12 Apr 2017 22:31:00 +0200 Message-Id: <20170412203103.6057-2-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 Instead of checking if this header file is used in the glibc, check if iti is not used in kernel context, this way it will also work with other libc implementations like musl. Acked-by: Mikko Rapeli Signed-off-by: Hauke Mehrtens --- include/uapi/linux/libc-compat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 44b8a6bd5fe1..7c1fead03c50 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -48,8 +48,8 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H -/* We have included glibc headers... */ -#if defined(__GLIBC__) +/* We have included libc headers... */ +#if !defined(__KERNEL__) /* Coordinate with glibc net/if.h header. */ #if defined(_NET_IF_H) && defined(__USE_MISC) @@ -168,7 +168,7 @@ /* If we did not see any headers from any supported C libraries, * or we are being included in the kernel, then define everything * that we need. */ -#else /* !defined(__GLIBC__) */ +#else /* defined(__KERNEL__) */ /* Definitions for if.h */ #define __UAPI_DEF_IF_IFCONF 1 @@ -208,6 +208,6 @@ /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1 -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ #endif /* _UAPI_LIBC_COMPAT_H */