From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10724 Path: news.gmane.org!.POSTED!not-for-mail From: Felix Janda Newsgroups: gmane.linux.kernel.api,gmane.linux.lib.musl.general Subject: [PATCH] uapi libc compat: allow non-glibc to opt out of uapi definitions Date: Thu, 10 Nov 2016 20:40:44 -0500 Message-ID: <20161111014044.GA26269@nyan> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1478828800 32291 195.159.176.226 (11 Nov 2016 01:46:40 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 11 Nov 2016 01:46:40 +0000 (UTC) User-Agent: Mutt/1.6.1 (2016-04-27) Cc: "David S. Miller" , linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, musl-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8@public.gmane.org To: linux-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Original-X-From: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Nov 11 02:46:35 2016 Return-path: Envelope-to: glka-linux-api@m.gmane.org Original-Received: from vger.kernel.org ([209.132.180.67]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c50v8-00069y-Vk for glka-linux-api@m.gmane.org; Fri, 11 Nov 2016 02:46:23 +0100 Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand id S964923AbcKKBqZ (ORCPT ); Thu, 10 Nov 2016 20:46:25 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]:37053 "EHLO mout02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965998AbcKKBqZ (ORCPT ); Thu, 10 Nov 2016 20:46:25 -0500 Original-Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EE2D020A99 for ; Fri, 11 Nov 2016 02:46:18 +0100 (CET) Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3tFN6x4l9zzyRB; Fri, 11 Nov 2016 02:46:17 +0100 (CET) Mail-Followup-To: linux-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "David S. Miller" , linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, musl-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8@public.gmane.org Content-Disposition: inline Original-Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Precedence: bulk List-ID: X-Mailing-List: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Xref: news.gmane.org gmane.linux.kernel.api:21820 gmane.linux.lib.musl.general:10724 Archived-At: Currently, libc-compat.h detects inclusion of specific glibc headers, and defines corresponding _UAPI_DEF_* macros, which in turn are used in uapi headers to prevent definition of conflicting structures/constants. There is no such detection for other c libraries, for them the _UAPI_DEF_* macros are always defined as 1, and so none of the possibly conflicting definitions are suppressed. This patch enables non-glibc c libraries to request the suppression of any specific interface by defining the corresponding _UAPI_DEF_* macro as 0. This patch together with the recent musl libc commit http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258 fixes the following compiler errors when is included after musl : ./linux/in6.h:32:8: error: redefinition of 'struct in6_addr' ./linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' ./linux/in6.h:59:8: error: redefinition of 'struct ipv6_mreq' Signed-off-by: Felix Janda --- include/uapi/linux/libc-compat.h | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 44b8a6b..c316725 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -171,42 +171,94 @@ #else /* !defined(__GLIBC__) */ /* Definitions for if.h */ +#if !defined(__UAPI_DEF_IF_IFCONF) #define __UAPI_DEF_IF_IFCONF 1 +#endif +#if !defined(__UAPI_DEF_IF_IFMAP) #define __UAPI_DEF_IF_IFMAP 1 +#endif +#if !defined(__UAPI_DEF_IFNAMSIZ) #define __UAPI_DEF_IF_IFNAMSIZ 1 +#endif +#if !defined(__UAPI_DEF_IFREQ) #define __UAPI_DEF_IF_IFREQ 1 +#endif /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ +#if !defined(__UAPI_DEF_IF_NET_DEVICE_FLAGS) #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 +#endif /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ +#if !defined(__UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO) #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 +#endif /* Definitions for in.h */ +#if !defined(__UAPI_DEF_IN_ADDR) #define __UAPI_DEF_IN_ADDR 1 +#endif +#if !defined(__UAPI_DEF_IN_IPPROTO) #define __UAPI_DEF_IN_IPPROTO 1 +#endif +#if !defined(__UAPI_DEF_IN_PKTINFO) #define __UAPI_DEF_IN_PKTINFO 1 +#endif +#if !defined(__UAPI_DEF_IP_MREQ) #define __UAPI_DEF_IP_MREQ 1 +#endif +#if !defined(__UAPI_DEF_SOCKADDR_IN) #define __UAPI_DEF_SOCKADDR_IN 1 +#endif +#if !defined(__UAPI_DEF_IN_CLASS) #define __UAPI_DEF_IN_CLASS 1 +#endif /* Definitions for in6.h */ +#if !defined(__UAPI_DEF_IN6_ADDR) #define __UAPI_DEF_IN6_ADDR 1 +#endif +#if !defined(__UAPI_DEF_IN6_ADDR_ALT) #define __UAPI_DEF_IN6_ADDR_ALT 1 +#endif +#if !defined(__UAPI_DEF_SOCKADDR_IN6) #define __UAPI_DEF_SOCKADDR_IN6 1 +#endif +#if !defined(__UAPI_DEF_IPV6_MREQ) #define __UAPI_DEF_IPV6_MREQ 1 +#endif +#if !defined(__UAPI_DEF_IPPROTO_V6) #define __UAPI_DEF_IPPROTO_V6 1 +#endif +#if !defined(__UAPI_DEF_IPV6_OPTIONS) #define __UAPI_DEF_IPV6_OPTIONS 1 +#endif +#if !defined(__UAPI_DEF_IN6_PKTINFO) #define __UAPI_DEF_IN6_PKTINFO 1 +#endif +#if !defined(__UAPI_DEF_IP6_MTUINFO) #define __UAPI_DEF_IP6_MTUINFO 1 +#endif /* Definitions for ipx.h */ +#if !defined(__UAPI_DEF_SOCKADDR_IPX) #define __UAPI_DEF_SOCKADDR_IPX 1 +#endif +#if !defined(__UAPI_DEF_IPX_ROUTE_DEFINITION) #define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 +#endif +#if !defined(__UAPI_DEF_IPX_INTERFACE_DEFINITION) #define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 +#endif +#if !defined(__UAPI_DEF_IPX_CONFIG_DATA) #define __UAPI_DEF_IPX_CONFIG_DATA 1 +#endif +#if !defined(__UAPI_DEF_IPX_ROUTE_DEF) #define __UAPI_DEF_IPX_ROUTE_DEF 1 +#endif /* Definitions for xattr.h */ +#if !defined(__UAPI_DEF_XATTR) #define __UAPI_DEF_XATTR 1 +#endif #endif /* __GLIBC__ */ -- 2.7.3