From: Haw Loeung <haw.loeung@canonical.com>
Date: Fri, 15 Aug 2014 23:32:27 +0000 (+1000)
Subject: Revert "fixed warning in net.c, fixed missing define of NSCOUNT in dns.c"
X-Git-Tag: v0.86~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e72060fa29c19a09a49c28df3b5a70477a838d3;p=thirdparty%2Fmtr.git

Revert "fixed warning in net.c, fixed missing define of NSCOUNT in dns.c"

This reverts commit 9a2aa603a0251148602731c1ae2857f032d0bad0.
---

diff --git a/dns.c b/dns.c
index 013e968..c5c3c1a 100644
--- a/dns.c
+++ b/dns.c
@@ -72,12 +72,6 @@
 //#define NSCOUNT6 myres.nscount
 //#define NSSOCKADDR6(i) (&(myres._u._ext.ext->nsaddrs[i].sin6))
 //#endif
-#else
-
-// No IPV6
-#define NSCOUNT myres.nscount
-#define NSCOUNT6 0
-#define NSSOCKADDR6(i) NULL
 #endif
 
 
diff --git a/net.c b/net.c
index 7ce9d7f..d43054b 100644
--- a/net.c
+++ b/net.c
@@ -305,13 +305,10 @@ void net_send_tcp(int index)
   int port;
   struct sockaddr_storage local;
   struct sockaddr_storage remote;
-  struct sockaddr_in  *local4  = (struct sockaddr_in  *) &local;
-  struct sockaddr_in  *remote4 = (struct sockaddr_in  *) &remote;
-#ifdef ENABLE_IPV6
-  struct sockaddr_in6 *local6  = (struct sockaddr_in6 *) &local;
+  struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
+  struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
+  struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
   struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
-#endif
-
   socklen_t len;
 
   ttl = index + 1;