struct sockaddr_storage progress

bk: 4015d034OPyPK5ntgwdXPcrVeQ9K0A

diff --git a/configure.in b/configure.in
index 767d388d4a97004c38605e706f2447de4a574db0..87f3c2a97e5ec8f446f84ff4b3f336d3b40abee5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -561,8 +561,6 @@ return 0;],
        ac_cv_struct_sockaddr_storage=yes,
        ac_cv_struct_sockaddr_storage=no)
 ])
-# HMS: Override this for now.
-ac_cv_struct_sockaddr_storage=no
 if test $ac_cv_struct_sockaddr_storage = yes; then
     AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?])
 fi

diff --git a/include/ntp_rfc2553.h b/include/ntp_rfc2553.h
index 674a08a504f97de19807c8f38ee69762fce93210..20c732f14b4c7ec3ec301ad024eba6ab33d2ddec 100644 (file)
--- a/include/ntp_rfc2553.h
+++ b/include/ntp_rfc2553.h
@@ -178,7 +178,6 @@ struct sockaddr_in6 {
                                _SS_PAD1SIZE - _SS_ALIGNSIZE)
 #endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
 
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
 struct sockaddr_storage {
 #ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
        u_int8_t        ss_len;         /* address length */
@@ -190,7 +189,6 @@ struct sockaddr_storage {
        u_int64_t       __ss_align;     /* force desired structure storage alignment */
        char            __ss_pad2[_SS_PAD2SIZE];
 };
-#endif /* not HAVE_STRUCT_SOCKADDR_STORAGE */
 
 struct addrinfo {
        int     ai_flags;       /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */