From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/15052 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "A. Wilcox" Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] netinet/ip.h: Add UAPI definition guard for iphdr Date: Sun, 22 Dec 2019 00:06:47 -0600 Message-ID: <20191222060646.7809-1-AWilcox@Wilcox-Tech.com> Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="249430"; mail-complaints-to="usenet@blaine.gmane.org" Cc: "A. Wilcox" To: musl@lists.openwall.com Original-X-From: musl-return-15068-gllmg-musl=m.gmane.org@lists.openwall.com Sun Dec 22 07:07:36 2019 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.89) (envelope-from ) id 1iiuOt-0012mo-K0 for gllmg-musl@m.gmane.org; Sun, 22 Dec 2019 07:07:35 +0100 Original-Received: (qmail 21855 invoked by uid 550); 22 Dec 2019 06:07:33 -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 21822 invoked from network); 22 Dec 2019 06:07:32 -0000 X-Mailer: git-send-email 2.22.1 Xref: news.gmane.org gmane.linux.lib.musl.general:15052 Archived-At: This ensures that the musl definition of 'struct iphdr' does not conflict with the Linux kernel UAPI definition of it. Some software, i.e. net-tools, will not compile against 5.4 kernel headers without this patch and the corresponding Linux kernel patch. --- include/netinet/ip.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/netinet/ip.h b/include/netinet/ip.h index 8b6d7fef..0ae132a5 100644 --- a/include/netinet/ip.h +++ b/include/netinet/ip.h @@ -190,6 +190,8 @@ struct ip_timestamp { #define IP_MSS 576 +#define __UAPI_DEF_IPHDR 0 + #ifdef __cplusplus } #endif -- 2.22.1