Fix for targets that do have 'struct in6_addr', but which doesn't

define 's6_addr' as a macro.

diff --git a/ares/ares.h b/ares/ares.h
index 37ad9b95cec2583974cdd51f7c7e588e9ce99d29..640101990b01e64df887e3f9472ec117a03c5acb 100644 (file)
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -245,7 +245,7 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
 int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
                      int alen, unsigned char **s, long *enclen);
 
-#ifndef s6_addr
+#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(s6_addr)
 struct in6_addr {
   union {
     unsigned char _S6_u8[16];

diff --git a/ares/ares_ipv6.h b/ares/ares_ipv6.h
index 080c5a20e7ef24ac5c8761c78a19e240e1c5a513..05d2c54b4b55b4af32fa928f2a2b89878835c98b 100644 (file)
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -22,7 +22,7 @@
 #define PF_INET6 AF_INET6
 #endif
 
-#ifndef s6_addr
+#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(s6_addr)
 struct in6_addr {
   union {
     unsigned char _S6_u8[16];
@@ -43,7 +43,7 @@ struct sockaddr_in6
 #endif
 
 #ifndef HAVE_STRUCT_ADDRINFO
-struct addrinfo 
+struct addrinfo
 {
   int              ai_flags;
   int              ai_family;