convert -idirafter to -I

[platform/upstream/net-tools.git] / iptunnel.c

diff --git a/iptunnel.c b/iptunnel.c
index 533a140..4943d83 100644 (file)
--- a/iptunnel.c
+++ b/iptunnel.c
@@ -13,6 +13,8 @@
  *
  * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
  * Rani Assaf <rani@magic.metawire.com> 980930:        do not allow key for ipip/sit
+ * Bernd Eckenfels 990715: add linux/types.h (not clean but solves missing __u16
+ * Arnaldo Carvalho de Melo 20010404: use setlocale
  */
 
 #include <stdio.h>
@@ -23,11 +25,17 @@
 #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>
 
 #include "config.h"
@@ -61,7 +69,7 @@
 #include "util-ank.h"
 
 char *Release = RELEASE,
-     *Version = "iptunnel 1.0",
+     *Version = "iptunnel 1.01",
      *Signature = "Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>";
 
 static void version(void)
@@ -574,6 +582,7 @@ int main(int argc, char **argv)
        char *basename;
 
 #if I18N
+       setlocale (LC_ALL, "");
        bindtextdomain("net-tools", "/usr/share/locale");
        textdomain("net-tools");
 #endif