From 2e9eb1a2ac8ec3953d8dba75248a3bab0e352b10 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 6 Mar 2010 01:23:09 +0000
Subject: [PATCH] removed usage of 's6_addr', fixing compilation issue
 triggered with no longer using 'in6_addr' but only our 'ares_in6_addr' struct

---
 ares/ares_gethostbyaddr.c | 2 +-
 ares/ares_gethostbyname.c | 4 +++-
 ares/ares_ipv6.h          | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 4b1dad36d..a2c3a9076 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -272,7 +272,7 @@ static void ptr_rr_name(char *name, const struct ares_addr *addr)
     }
   else
     {
-       unsigned char *bytes = (unsigned char *)&addr->addrV6.s6_addr;
+       unsigned char *bytes = (unsigned char *)&addr->addrV6;
        /* There are too many arguments to do this in one line using
         * minimally C89-compliant compilers */
        sprintf(name,
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index bf88309c1..ebad67075 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -504,7 +504,9 @@ static int get6_address_index(const struct ares_in6_addr *addr,
     {
       if (sortlist[i].family != AF_INET6)
         continue;
-        if (!ares_bitncmp(&addr->s6_addr, &sortlist[i].addrV6.s6_addr, sortlist[i].mask.bits))
+        if (!ares_bitncmp(addr,
+                          &sortlist[i].addrV6,
+                          sortlist[i].mask.bits))
           break;
     }
   return i;
diff --git a/ares/ares_ipv6.h b/ares/ares_ipv6.h
index 5bb7b8cf7..4a97199c3 100644
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -22,10 +22,6 @@
 #define PF_INET6 AF_INET6
 #endif
 
-#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(s6_addr)
-#define s6_addr _S6_un._S6_u8
-#endif
-
 #ifndef HAVE_STRUCT_SOCKADDR_IN6
 struct sockaddr_in6
 {