Submitted By: Uwe Düffert (lfs at uwe-dueffert dot de)
Date: 2004-05-15
Initial Package Version: 1.60
Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/net-tools-1.60-linux-libc-headers-2651-1.patch
Upstream Status: not reported
Description: if_tunnel.h from linux-libc-headers-2.6.5.1 uses its own linux/if.h
  conflicting with glibcs net/if.h. This patch uses linux/if_* only.
 
diff -Naur net-tools-1.60.orig/iptunnel.c net-tools-1.60/iptunnel.c
--- net-tools-1.60.orig/iptunnel.c	2004-05-15 11:17:12.561429960 +0000
+++ net-tools-1.60/iptunnel.c	2004-05-15 11:17:39.159386456 +0000
@@ -28,13 +28,13 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
-#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
-#include <net/if.h>
-#include <net/if_arp.h>
-#else
+//#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+//#include <net/if.h>
+//#include <net/if_arp.h>
+//#else
 #include <linux/if.h>
 #include <linux/if_arp.h>
-#endif
+//#endif
 #include <linux/types.h>
 #include <linux/if_tunnel.h>