From: Felix Janda <felix.janda@posteo.de>
To: linux-kernel@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
linux-api@vger.kernel.org, musl@lists.openwall.com
Subject: [PATCH resent] uapi libc compat: allow non-glibc to opt out of uapi definitions
Date: Fri, 11 Nov 2016 07:08:41 -0500 [thread overview]
Message-ID: <20161111120820.GA435@nyan> (raw)
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 <linux/in6.h> is included
after musl <netinet/in.h>:
./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 <felix.janda@posteo.de>
---
The previous mail misspelled the kernel mailing list. I am sorry for
this resulting spam.
There has already been one reply, which is available at
http://www.openwall.com/lists/musl/2016/11/11/2
---
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
next reply other threads:[~2016-11-11 12:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 12:08 Felix Janda [this message]
2017-03-08 12:46 ` [PATCH resent] uapi libc compat: allow non-glibc to opt out of uapi definitions David Woodhouse
2017-03-08 16:39 ` Carlos O'Donell
[not found] ` <459a8faf-4585-5063-3d94-3a1fecfa8289-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-04-25 6:45 ` [musl] " Hauke Mehrtens
2017-04-25 12:29 ` Carlos O'Donell
2017-04-25 17:00 ` Rich Felker
[not found] ` <9f591383-6e4c-c231-1e5b-68e4b8c16d94-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-06-02 7:07 ` [musl] " Florian Weimer
[not found] ` <1488977188.4347.134.camel-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2017-04-25 6:37 ` Hauke Mehrtens
[not found] ` <9373f78c-ff15-fbb5-724a-27152d6f994b-5/S+JYg5SzeELgA04lAiVw@public.gmane.org>
2017-04-25 12:13 ` Carlos O'Donell
2017-07-08 20:27 ` Felix Janda
2017-03-08 15:53 ` Carlos O'Donell
2017-03-08 16:25 ` Rich Felker
2017-03-08 17:29 ` Carlos O'Donell
2017-03-09 0:14 ` Szabolcs Nagy
2017-03-09 0:51 ` Carlos O'Donell
2017-03-09 2:01 ` Rich Felker
[not found] ` <20170309001435.GJ2082-4P1ElwuDYu6sTnJN9+BGXg@public.gmane.org>
2017-04-25 13:22 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161111120820.GA435@nyan \
--to=felix.janda@posteo.de \
--cc=davem@davemloft.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).