From d0c8cefd43bc2cf2a21547801513f2df41962f31 Mon Sep 17 00:00:00 2001
From: pb <pb>
Date: Sat, 20 May 2000 18:07:19 +0000
Subject: [PATCH] Make more glibc friendly.

---
 ipmaddr.c  | 10 ++++++----
 iptunnel.c |  9 +++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ipmaddr.c b/ipmaddr.c
index 3ca668e74..4bf54db2f 100644
--- a/ipmaddr.c
+++ b/ipmaddr.c
@@ -17,14 +17,16 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <linux/netdevice.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
-#include <linux/sockios.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
+#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+#include <net/if.h>
+#else
+#include <linux/if.h>
+#endif
+
 #include "config.h"
 #include "intl.h"
 #include "util-ank.h"
diff --git a/iptunnel.c b/iptunnel.c
index 2528eebd2..979c1f8db 100644
--- a/iptunnel.c
+++ b/iptunnel.c
@@ -24,11 +24,16 @@
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
 #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
+#include <linux/if.h>
+#include <linux/if_arp.h>
+#endif
 #include <linux/types.h>
 #include <linux/if_tunnel.h>
 
-- 
2.11.4.GIT