diff --git a/src/core/ddsi/src/ddsi_tcp.c b/src/core/ddsi/src/ddsi_tcp.c
index 6a57fb1..b2b1f9e 100644
--- a/src/core/ddsi/src/ddsi_tcp.c
+++ b/src/core/ddsi/src/ddsi_tcp.c
@@ -560,7 +560,7 @@ static ssize_t ddsi_tcp_conn_write (ddsi_tran_conn_t base, const nn_locator_t *d
   memset(&msg, 0, sizeof(msg));
   set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov);
   msg.msg_name = &dstaddr;
-  msg.msg_namelen = (socklen_t) os_sockaddr_size((os_sockaddr *) &dstaddr);
+  msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr);
 #if SYSDEPS_MSGHDR_FLAGS
   msg.msg_flags = (int) flags;
 #endif
@@ -867,7 +867,7 @@ static ddsi_tcp_conn_t ddsi_tcp_new_conn (os_socket sock, bool server, os_sockad
   ddsi_tcp_base_init (&conn->m_base);
   os_mutexInit (&conn->m_mutex);
   conn->m_sock = Q_INVALID_SOCKET;
-  (void)memcpy(&conn->m_peer_addr, peer, os_sockaddr_size(peer));
+  (void)memcpy(&conn->m_peer_addr, peer, os_sockaddr_get_size(peer));
   conn->m_peer_port = os_sockaddr_get_port (peer);
   conn->m_base.m_server = server;
   conn->m_base.m_base.m_port = INVALID_PORT;
@@ -1009,7 +1009,7 @@ static void ddsi_tcp_unblock_listener (ddsi_tran_listener_t listener)
       }
       do
       {
-        ret = connect (sock, (struct sockaddr *) &addr, (unsigned) os_sockaddr_size((os_sockaddr *)&addr));
+        ret = connect (sock, (struct sockaddr *) &addr, (unsigned) os_sockaddr_get_size((os_sockaddr *)&addr));
       }
       while ((ret == -1) && (os_getErrno() == os_sockEINTR));
       if (ret == -1)
diff --git a/src/core/ddsi/src/ddsi_udp.c b/src/core/ddsi/src/ddsi_udp.c
index 62d8441..bf08a9c 100644
--- a/src/core/ddsi/src/ddsi_udp.c
+++ b/src/core/ddsi/src/ddsi_udp.c
@@ -121,7 +121,7 @@ static ssize_t ddsi_udp_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *d
   ddsi_ipaddr_from_loc(&dstaddr, dst);
   set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov);
   msg.msg_name = &dstaddr;
-  msg.msg_namelen = (socklen_t) os_sockaddr_size((os_sockaddr *) &dstaddr);
+  msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr);
 #if !defined(__sun) || defined(_XPG4_2)
   msg.msg_control = NULL;
   msg.msg_controllen = 0;
diff --git a/src/os/include/os/os_socket.h b/src/os/include/os/os_socket.h
index 5231798..6f168b4 100644
--- a/src/os/include/os/os_socket.h
+++ b/src/os/include/os/os_socket.h
@@ -257,7 +257,7 @@ extern "C" {
      * @pre sa is a valid os_sockaddr pointer.
      */
     OSAPI_EXPORT size_t
-    os_sockaddr_size(
+    os_sockaddr_get_size(
         const os_sockaddr *const sa) __nonnull_all__;
 
     /**
diff --git a/src/os/src/os_socket.c b/src/os/src/os_socket.c
index 82b8988..528abad 100644
--- a/src/os/src/os_socket.c
+++ b/src/os/src/os_socket.c
@@ -46,14 +46,14 @@ const os_in6_addr os_in6addr_loopback = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
 #endif
 
 size_t
-os_sockaddr_size(const os_sockaddr *const sa)
+os_sockaddr_get_size(const os_sockaddr *const sa)
 {
     size_t sz;
 
     assert(sa != NULL);
 
     switch(sa->sa_family) {
-#if (OS_SOCKET_HAS_IPV6 == 1)
+#if OS_SOCKET_HAS_IPV6
         case AF_INET6:
             sz = sizeof(os_sockaddr_in6);
             break;
diff --git a/src/os/src/posix/os_platform_ifaddrs.c b/src/os/src/posix/os_platform_ifaddrs.c
index c31f69c..9413352 100644
--- a/src/os/src/posix/os_platform_ifaddrs.c
+++ b/src/os/src/posix/os_platform_ifaddrs.c
@@ -24,7 +24,7 @@ copyaddr(os_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
     assert(ifap != NULL);
     assert(sys_ifa != NULL);
 
-    sz = os_sockaddr_size(sys_ifa->ifa_addr);
+    sz = os_sockaddr_get_size(sys_ifa->ifa_addr);
     ifa = os_calloc_s(1, sizeof(*ifa));
     if (ifa == NULL) {
         err = errno;