moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-01 01:41:50 -05:00
Code Issues Releases Wiki Activity

removed usage of 's6_addr', fixing compilation issue triggered with no

Browse Source 
longer using 'in6_addr' but only our 'ares_in6_addr' struct
This commit is contained in:
Yang Tse 2010-03-06 01:23:09 +00:00
parent f5d8c0befc
commit 2e9eb1a2ac
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ares/ares_gethostbyaddr.c
View File

@ -272,7 +272,7 @@ static void ptr_rr_name(char *name, const struct ares_addr *addr)
} }
else 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 /* There are too many arguments to do this in one line using
* minimally C89-compliant compilers */ * minimally C89-compliant compilers */
sprintf(name, sprintf(name,

4
ares/ares_gethostbyname.c
View File

@ -504,7 +504,9 @@ static int get6_address_index(const struct ares_in6_addr *addr,
{ {
if (sortlist[i].family != AF_INET6) if (sortlist[i].family != AF_INET6)
continue; 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; break;
} }
return i; return i;

4
ares/ares_ipv6.h
View File

@ -22,10 +22,6 @@
#define PF_INET6 AF_INET6 #define PF_INET6 AF_INET6
#endif #endif
#if !defined(HAVE_STRUCT_IN6_ADDR) && !defined(s6_addr)
#define s6_addr _S6_un._S6_u8
#endif
#ifndef HAVE_STRUCT_SOCKADDR_IN6 #ifndef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 struct sockaddr_in6
{ {