[PATCH 10/11] include/resolv.h: provide __res_state._u even if !__UCLIBC_HAS_IPV6__

Daniel Mack zonque at gmail.com
Tue Jul 12 22:30:55 UTC 2011


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 at gmail.com>
---
 include/resolv.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/resolv.h b/include/resolv.h
index 186b781..55e9dee 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.
-- 
1.7.5.4



More information about the uClibc mailing list