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.

diff --git a/include/netinet/ip.h b/include/netinet/ip.h
index 8b6d7fefe6d225dd6ffd5fa2fa41f0640c1a2d86..0ae132a58584b6916e13c9c72015def387c35442 100644 (file)
--- 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