Commit 2e9eb1a2 authored by Yang Tse's avatar Yang Tse
Browse files 

removed usage of 's6_addr', fixing compilation issue triggered with no
longer using 'in6_addr' but only our 'ares_in6_addr' struct
parent f5d8c0be

ares/ares_gethostbyaddr.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

ares/ares_gethostbyname.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

ares/ares_ipv6.h

+0 −4
Original line number Diff line number Diff line
@@ -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

{