Attempt to bugfix ipv6 addr defs preprocessors check

src/SConscript

@@ -107,9 +107,10 @@ if not os.path.exists("config.log") and not env.GetOption('clean'):
 		print 'Did not find the openssl headers, exiting!'
 		Execute(Delete('config.log'))
 		Exit(1)
-
-	if conf.CheckCHeader(["net/if.h", "netinet/in.h"]):
-		env.Append(CCFLAGS = ['-DHAVE_NET_IF_H'])
+	if not conf.CheckCHeader(["net/if.h", "netinet/in.h"]):
+		print 'Did not find the net/if.h and netinet/in.h headers, exiting!'
+		Execute(Delete('config.log'))
+		Exit(1)
 		
 	env = conf.Finish()
 

src/libiptc/libiptc.h

@@ -7,23 +7,11 @@
 
 #include <limits.h>
 
-#ifdef HAVE_NET_IF_H
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <sys/types.h>
-#else							/* libc5 */
-#include <sys/socket.h>
-#include <linux/ip.h>
-#include <linux/in.h>
-#include <linux/if.h>
-#include <linux/icmp.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/types.h>
-#include <linux/in6.h>
-#endif
 #endif
 #include <linux/netfilter_ipv4/ip_tables.h>
 

src/ntkresolv.c

@@ -340,11 +340,7 @@ opts_set_question(char *arg)
 			ntkresolv_safe_exit(1);
 		}
 		G_ALIGN(16);
-#ifdef HAVE_NET_IF_H
-		memcpy(GQT->qstdata, &i6a.__in6_union, 16);
-#else
-		memcpy(GQT->qstdata, &i6a.__in6_u, 16);
-#endif
+		memcpy(GQT->qstdata, &i6a.s6_addr16, 16);
 		GQT->ipv = ANDNS_IPV6;
 		return;
 	case QTYPE_G:
@@ -428,11 +424,7 @@ ip_bin_to_str(void *data, char *dst)
 		via = (void *) (&ia);
 		break;
 	case AF_INET6:
-#ifdef HAVE_NET_IF_H
-		memcpy(&(i6a.__in6_union), data, 16);
-#else
-		memcpy(&(i6a.__in6_u), data, 16);
-#endif
+		memcpy(&(i6a.s6_addr16), data, 16);
 		via = (void *) (&i6a);
 		break;
 	default: