3 files changed, 3 insertions, 12 deletions
diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
index 5063ae800..03666a0aa 100644
--- a/src/include/fake-addrinfo.h
+++ b/src/include/fake-addrinfo.h
@@ -203,7 +203,7 @@ struct addrinfo {
 # define AI_DEFAULT (AI_ADDRCONFIG|AI_V4MAPPED)
 #endif
 
-#if defined(KRB5_USE_INET6) && defined(NEED_INSIXADDR_ANY)
+#if defined(NEED_INSIXADDR_ANY)
 /* If compiling with IPv6 support and C library does not define in6addr_any */
 extern const struct in6_addr krb5int_in6addr_any;
 #undef in6addr_any
diff --git a/src/include/socket-utils.h b/src/include/socket-utils.h
index 19145c85f..484e294f8 100644
--- a/src/include/socket-utils.h
+++ b/src/include/socket-utils.h
@@ -51,7 +51,7 @@
 
    Do NOT install this file.  */
 
-/* for HAVE_SOCKLEN_T, KRB5_USE_INET6, etc */
+/* for HAVE_SOCKLEN_T etc */
 #include "autoconf.h"
 /* for sockaddr_storage */
 #include "port-sockets.h"
@@ -72,12 +72,10 @@ static inline struct sockaddr_in *sa2sin (struct sockaddr *sa)
 {
     return (struct sockaddr_in *) (void *) sa;
 }
-#ifdef KRB5_USE_INET6
 static inline struct sockaddr_in6 *sa2sin6 (struct sockaddr *sa)
 {
     return (struct sockaddr_in6 *) (void *) sa;
 }
-#endif
 static inline struct sockaddr *ss2sa (struct sockaddr_storage *ss)
 {
     return (struct sockaddr *) ss;
@@ -86,23 +84,17 @@ static inline struct sockaddr_in *ss2sin (struct sockaddr_storage *ss)
 {
     return (struct sockaddr_in *) ss;
 }
-#ifdef KRB5_USE_INET6
 static inline struct sockaddr_in6 *ss2sin6 (struct sockaddr_storage *ss)
 {
     return (struct sockaddr_in6 *) ss;
 }
-#endif
 
 #if !defined (socklen)
 /* 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 ? (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 ? (socklen_t) sizeof (struct sockaddr_in) : (socklen_t) sizeof (struct sockaddr))
-#    endif
+#    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))
 #  endif
 #endif
 
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 82d3ff736..53f274af7 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -115,7 +115,6 @@ typedef _W64 int         ssize_t;
 #define SYS_ERRLIST_DECLARED
 /* if __STDC_VERSION__ >= 199901L this shouldn't be needed */
 #define inline __inline
-#define KRB5_USE_INET6
 #define NEED_INSIXADDR_ANY
 #define ENABLE_THREADS
 #endif