[Bug 432] More in6addr_any cleanup

bk: 429594cdVqYPBp3EYChQTFRstlpZ7Q

diff --git a/libisc/netaddr.c b/libisc/netaddr.c
index 1d9cafd6117e0ce700094dc2e50e6d9761840ebe..1fcd1027b39dd37945c1bf0ab97b7819c7e26511 100644 (file)
--- a/libisc/netaddr.c
+++ b/libisc/netaddr.c
@@ -345,6 +345,7 @@ isc_netaddr_issitelocal(isc_netaddr_t *na) {
        }
 }
 
+#ifdef ISC_PLATFORM_HAVEIPV6
 void
 isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) {
        isc_netaddr_t *src;
@@ -359,3 +360,4 @@ isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) {
        memcpy(&t->type.in, (char *)&src->type.in6 + 12, 4);
        return;
 }
+#endif

diff --git a/libisc/sockaddr.c b/libisc/sockaddr.c
index 8f27d9d20b79b3f998cb254f4872d2167fec0f0a..4e928169e5bb58c5d340158e106f737795c934e6 100644 (file)
--- a/libisc/sockaddr.c
+++ b/libisc/sockaddr.c
@@ -211,6 +211,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
                p = ntohs(sockaddr->type.sin.sin_port);
                length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
                break;
+#if ISC_PLATFORM_HAVEIPV6
        case AF_INET6:
                in6 = &sockaddr->type.sin6.sin6_addr;
                if (IN6_IS_ADDR_V4MAPPED(in6)) {
@@ -222,6 +223,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
                }
                p = ntohs(sockaddr->type.sin6.sin6_port);
                break;
+#endif
        default:
                UNEXPECTED_ERROR(__FILE__, __LINE__,
                                 isc_msgcat_get(isc_msgcat,