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

define 's6_addr' as a macro.
17 years ago · 6fed3ff520
parent 6606c99b86
commit 6fed3ff520
2 changed files with 3 additions and 3 deletions
--- a/ares.h
+++ b/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];
--- a/ares_ipv6.h
+++ b/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;