summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-22 00:06:47 -0600
committerRich Felker <dalias@aerifal.cx>2019-12-22 12:45:48 -0500
commit0738e6c19fb03d11ee55637b75171fc9f8287572 (patch)
tree18f1e7f7cd90fa36a01c3e49a64a88d8fbfb4b2e /include
parent1e7f0fcd7ff2096904fd93a2ee6d12a2392be392 (diff)
downloadmusl-0738e6c19fb03d11ee55637b75171fc9f8287572.tar.gz
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.
Diffstat (limited to 'include')
-rw-r--r--include/netinet/ip.h2
1 files changed, 2 insertions, 0 deletions
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