Commit ca95f58a authored by Yang Tse's avatar Yang Tse
Browse files

Needed now that in6_addr is referenced in ares.h

parent ed636cbe

ares/ahost.c

+0 −7
Original line number Diff line number Diff line
@@ -40,13 +40,6 @@ 
#include "inet_net_pton.h"

#include "ares_getopt.h"



#ifndef HAVE_STRUCT_IN6_ADDR

struct in6_addr

{

  unsigned char s6_addr[16];

};

#endif



static void callback(void *arg, int status, int timeouts, struct hostent *host);

static void usage(void);

ares/ares.h

+15 −2
Original line number Diff line number Diff line
@@ -43,8 +43,12 @@ 
  #include <sys/socket.h>

  #include <tcp.h>

#elif defined(WIN32)

  #include <winsock2.h>

#  ifndef WIN32_LEAN_AND_MEAN

#    define WIN32_LEAN_AND_MEAN

#  endif

#  include <windows.h>

#  include <winsock2.h>

#  include <ws2tcpip.h>

#else

  #include <netinet/in.h>

  #include <sys/socket.h>
@@ -241,6 +245,15 @@ 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

struct in6_addr {

  union {

    unsigned char _S6_u8[16];

  } _S6_un;

};

#define s6_addr _S6_un._S6_u8

#endif



struct addrttl {

  struct in_addr ipaddr;

  int            ttl;

ares/ares_ipv6.h

+6 −4
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ 
#define PF_INET6 AF_INET6

#endif



#ifndef HAVE_STRUCT_IN6_ADDR

struct in6_addr

{

  unsigned char s6_addr[16];

#ifndef s6_addr

struct in6_addr {

  union {

    unsigned char _S6_u8[16];

  } _S6_un;

};

#define s6_addr _S6_un._S6_u8

#endif



#ifndef HAVE_STRUCT_SOCKADDR_IN6

ares/ares_parse_a_reply.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <stdlib.h>

#include <string.h>

#include <limits.h>

#include "ares.h"

#include "ares_dns.h"

#include "ares_private.h"

ares/ares_parse_aaaa_reply.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <stdlib.h>

#include <string.h>

#include <limits.h>

#include "ares.h"

#include "ares_dns.h"

#include "inet_net_pton.h"