From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/11795 Path: news.gmane.org!.POSTED!not-for-mail From: Hauke Mehrtens Newsgroups: gmane.linux.lib.musl.general Subject: kernel: suppress some more Linux uapi definitions Date: Fri, 4 Aug 2017 17:09:28 +0200 Message-ID: <20170804150928.27579-1-hauke@hauke-m.de> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1501859411 19055 195.159.176.226 (4 Aug 2017 15:10:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 4 Aug 2017 15:10:11 +0000 (UTC) Cc: felix.janda@posteo.de, dalias@libc.org, Hauke Mehrtens To: musl@lists.openwall.com Original-X-From: musl-return-11808-gllmg-musl=m.gmane.org@lists.openwall.com Fri Aug 04 17:10:06 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1ddeEo-0004ga-51 for gllmg-musl@m.gmane.org; Fri, 04 Aug 2017 17:10:06 +0200 Original-Received: (qmail 21711 invoked by uid 550); 4 Aug 2017 15:10:07 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 21670 invoked from network); 4 Aug 2017 15:10:05 -0000 X-Virus-Scanned: amavisd-new at heinlein-support.de Xref: news.gmane.org gmane.linux.lib.musl.general:11795 Archived-At: The following commit activated the suppression of some uapi definitions in musl 04983f227238 ("make netinet/in.h suppress clashing definitions from kernel headers"), but it still misses some of the definitions for other files. This will deactivate the definitions in the user space header files exported by the Linux kernel. This fully works when Felix's patch posted here is applied to the Linux kernel: https://patchwork.kernel.org/patch/9869953/ Signed-off-by: Hauke Mehrtens --- include/net/if.h | 7 +++++++ include/sys/xattr.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/include/net/if.h b/include/net/if.h index 2f2fcc10..21f10801 100644 --- a/include/net/if.h +++ b/include/net/if.h @@ -125,6 +125,13 @@ struct ifconf { #define ifc_req ifc_ifcu.ifcu_req #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) +#define __UAPI_DEF_IF_IFCONF 0 +#define __UAPI_DEF_IF_IFMAP 0 +#define __UAPI_DEF_IF_IFNAMSIZ 0 +#define __UAPI_DEF_IF_IFREQ 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + #endif #ifdef __cplusplus diff --git a/include/sys/xattr.h b/include/sys/xattr.h index 6479fcc6..7a0197ba 100644 --- a/include/sys/xattr.h +++ b/include/sys/xattr.h @@ -24,6 +24,8 @@ int removexattr(const char *, const char *); int lremovexattr(const char *, const char *); int fremovexattr(int, const char *); +#define __UAPI_DEF_XATTR 0 + #ifdef __cplusplus } #endif -- 2.11.0