From 440f8b353f62e83c69fef7dc0507c04392e6388c Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Fri, 6 Aug 1999 20:01:20 +0000 Subject: [PATCH] (sockaddr_storage): cater for those that have v6-support also git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6762 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/roken/roken.h.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index f4efcbbf0..3d271dc27 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -438,7 +438,12 @@ typedef unsigned short sa_family_t; struct sockaddr_storage { u_int8_t __ss_len; sa_family_t __ss_family; - char pad[sizeof(struct sockaddr_in) + char pad[ +#ifdef HAVE_IPV6 + sizeof(struct sockaddr_in6) +#else + sizeof(struct sockaddr_in) +#endif - sizeof(u_int8_t) - sizeof(sa_family_t)]; }; @@ -446,7 +451,13 @@ struct sockaddr_storage { struct sockaddr_storage { sa_family_t __ss_family; - char pad[sizeof(struct sockaddr_in) - sizeof(sa_family_t)]; + char pad[ +#ifdef HAVE_IPV6 + sizeof(struct sockaddr_in6) +#else + sizeof(struct sockaddr_in) +#endif + - sizeof(sa_family_t)]; }; #endif