From bd99a7dc8c977c397003eed51d3ccb5648447d15 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 10 Dec 2007 16:14:02 +0000 Subject: Fix for targets that do have 'struct in6_addr', but which doesn't define 's6_addr' as a macro. --- ares/ares.h | 2 +- ares/ares_ipv6.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ares') diff --git a/ares/ares.h b/ares/ares.h index 37ad9b95c..640101990 100644 --- 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 080c5a20e..05d2c54b4 100644 --- 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; -- cgit v1.2.3