From d0ff0d42782817f6a1115dd2d1b58e9c6b519d51 Mon Sep 17 00:00:00 2001
From: Mike Bennett <mbennett@google.com>
Date: Wed, 19 Jun 2019 09:35:46 -0700
Subject: Avoid a double-definition (iphdr) from netinet/in.h and
 linux/ip_tunnel.h by locally defining the single constant definition ip.c
 uses (IP_DF) if not already defined.

---
 toys/pending/ip.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'toys/pending')

diff --git a/toys/pending/ip.c b/toys/pending/ip.c
index 66dd06fe..c4bb5d6c 100644
--- a/toys/pending/ip.c
+++ b/toys/pending/ip.c
@@ -34,9 +34,12 @@ config IP
 #include <net/if_arp.h>
 #include <ifaddrs.h>
 #include <fnmatch.h>
-#include <netinet/ip.h>
 #include <linux/if_tunnel.h>
 
+#ifndef IP_DF
+#define IP_DF 0x4000  /* don't fragment flag. */
+#endif
+
 GLOBALS(
   char stats, singleline, flush, *filter_dev, gbuf[8192];
   int sockfd, connected, from_ok, route_cmd;
-- 
cgit v1.2.3