diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index a0a51ea8b9..7057f2336f 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.h,v 1.22 2002/10/24 03:52:34 marka Exp $ */
+/* $Id: netaddr.h,v 1.23 2002/10/28 02:16:20 marka Exp $ */
 
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1
@@ -32,7 +32,7 @@ struct isc_netaddr {
     		struct in_addr in;
 		struct in6_addr in6;
 	} type;
-	u_int32_t zone;
+	isc_uint32_t zone;
 };
 
 isc_boolean_t
@@ -96,9 +96,9 @@ void
 isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6);
 
 void
-isc_netaddr_setzone(isc_netaddr_t *netaddr, u_int32_t zone);
+isc_netaddr_setzone(isc_netaddr_t *netaddr, isc_uint32_t zone);
 
-u_int32_t
+isc_uint32_t
 isc_netaddr_getzone(const isc_netaddr_t *netaddr);
 
 void
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index 8fd873efc1..c246e6a0ba 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.c,v 1.28 2002/10/24 03:52:34 marka Exp $ */
+/* $Id: interfaceiter.c,v 1.29 2002/10/28 02:16:21 marka Exp $ */
 
 #include <config.h>
 
@@ -92,14 +92,14 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
 			 * we only consider unicast link-local addresses.
 			 */
 			if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {
-				u_int16_t zone;
+				isc_uint16_t zone;
 
 				memcpy(&zone, &sa6->sin6_addr.s6_addr[2],
 				       sizeof(zone));
 				zone = ntohs(zone);
 				if (zone != 0) { /* the zone ID is embedded */
 					isc_netaddr_setzone(dst,
-							    (u_int32_t)zone);
+							    (isc_uint32_t)zone);
 					dst->type.in6.s6_addr[2] = 0;
 					dst->type.in6.s6_addr[3] = 0;
 				}