diff options
| author | Daniel Mack <zonque@gmail.com> | 2011-07-13 00:30:55 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2011-08-26 09:29:54 +0200 |
| commit | 77fbcc8440c28ea30ebf5a38c7be1d0c7b080772 (patch) | |
| tree | 7166de17a9f846034bd2ac3ed3071f53bce9fafe /include | |
| parent | 7f74de5d4d6d10baafab4b37bb3d472f5c5f0e8c (diff) | |
include/resolv.h: provide __res_state._u even if !__UCLIBC_HAS_IPV6__
This struct is used for IPv4 as well, so only make the members
conditional that are purely used by IPv6.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/resolv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/resolv.h b/include/resolv.h index 186b78112..55e9dee91 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -138,7 +138,6 @@ struct __res_state { } sort_list[MAXRESOLVSORT]; #endif -#ifdef __UCLIBC_HAS_IPV6__ /* I assume that the intention is to store all * DNS servers' addresses here, and duplicate in nsaddr_list[] * those which have IPv4 address. In the case of IPv4 address @@ -152,7 +151,9 @@ struct __res_state { */ union { struct { +#ifdef __UCLIBC_HAS_IPV6__ struct sockaddr_in6 *nsaddrs[MAXNS]; +#endif u_int8_t nscount; /* (was: u_int16_t) */ #ifdef __UCLIBC_HAS_COMPAT_RES_STATE__ /* rather obscure, and differs in BSD and glibc */ @@ -166,7 +167,6 @@ struct __res_state { #endif } _ext; } _u; -#endif #ifdef __UCLIBC_HAS_EXTRA_COMPAT_RES_STATE__ /* Truly obscure stuff. |