diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c
index d8c734b35a..2f9d9f996b 100644
--- a/bin/tests/dispatch_tcp_test.c
+++ b/bin/tests/dispatch_tcp_test.c
@@ -168,7 +168,7 @@ start_response(void)
 
 	memset(&from, 0, sizeof(from));
 	from.length = sizeof(struct sockaddr_in);
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	from.type.sa.sa_len = sizeof(struct sockaddr_in);
 #endif
 	from.type.sin.sin_port = htons(53);
diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c
index 8d335cf055..bf5594cff8 100644
--- a/bin/tests/dispatch_test.c
+++ b/bin/tests/dispatch_test.c
@@ -144,7 +144,7 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
 
 	memset(&from, 0, sizeof(from));
 	from.length = sizeof(struct sockaddr_in);
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	from.type.sa.sa_len = sizeof(struct sockaddr_in);
 #endif
 	from.type.sin.sin_port = htons(53);
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index ced9809f07..a9af420a6c 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -188,7 +188,7 @@ isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 {
 	memset(sockaddr, 0, sizeof *sockaddr);
 	sockaddr->type.sin.sin_family = AF_INET;
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	sockaddr->type.sin.sin_len = sizeof sockaddr->type.sin;
 #endif
 	sockaddr->type.sin.sin_addr = *ina;
@@ -203,7 +203,7 @@ isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
 {
 	memset(sockaddr, 0, sizeof *sockaddr);
 	sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
 #endif
 	sockaddr->type.sin6.sin6_addr = *ina6;
@@ -218,7 +218,7 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 {
 	memset(sockaddr, 0, sizeof *sockaddr);
 	sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_NET_HAVESALEN
+#ifdef ISC_PLATFORM_HAVESALEN
 	sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
 #endif
 	sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;