* socket-utils.h (socklen) [! HAVE_SA_LEN]: Return a socklen_t instead of size_t

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14463 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index b1f68f78b682e35f3dc6978f62cb33e392e36a69..2fdec2914535449bd32e70a0dcccc3205b9604a1 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-31  Ken Raeburn  <raeburn@mit.edu>
 
+       * socket-utils.h (socklen) [! HAVE_SA_LEN]: Return a socklen_t
+       instead of size_t.
+
        * configure.in: Check return type for getservbyname_r just as for
        gethostbyname_r.
        * fake-addrinfo.h (GET_HOST_BY_NAME): Use plain gethostbyname if

diff --git a/src/include/socket-utils.h b/src/include/socket-utils.h
index 82e85f178b0409b2232c749e2be7f3edcb836e04..b71545950839bd365578bdb85aa4db2ea967c9f0 100644 (file)
--- a/src/include/socket-utils.h
+++ b/src/include/socket-utils.h
@@ -109,15 +109,14 @@ static __inline__ struct sockaddr_in6 *ss2sin6 (struct sockaddr_storage *ss)
 #endif
 
 #if !defined (socklen)
-/* size_t socklen (struct sockaddr *) */
-/* Should this return socklen_t instead? */
+/* socklen_t socklen (struct sockaddr *) */
 #  ifdef HAVE_SA_LEN
 #    define socklen(X) ((X)->sa_len)
 #  else
 #    ifdef KRB5_USE_INET6
-#      define socklen(X) ((X)->sa_family == AF_INET6 ? sizeof (struct sockaddr_in6) : (X)->sa_family == AF_INET ? sizeof (struct sockaddr_in) : sizeof (struct sockaddr))
+#      define socklen(X) ((X)->sa_family == AF_INET6 ? (socklen_t) sizeof (struct sockaddr_in6) : (X)->sa_family == AF_INET ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
 #    else
-#      define socklen(X) ((X)->sa_family == AF_INET ? sizeof (struct sockaddr_in) : sizeof (struct sockaddr))
+#      define socklen(X) ((X)->sa_family == AF_INET ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
 #    endif
 #  endif
 #endif