diff options
Diffstat (limited to 'src/include/socket-utils.h')
| -rw-r--r-- | src/include/socket-utils.h | 12 |
1 files changed, 2 insertions, 10 deletions
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 |