From 0738e6c19fb03d11ee55637b75171fc9f8287572 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 22 Dec 2019 00:06:47 -0600
Subject: add uapi guards for new netinet/ip.h conflict with struct iphdr

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(+)

(limited to 'include/netinet/ip.h')

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
-- 
cgit v1.2.1