Assume that libc provides struct sockaddr_in6.sin6_scope_id

* configure.ac (AC_CHECK_MEMBERS): Remove
struct sockaddr_in6.sin6_scope_id.
* net.c (print_sockaddr_data_in6): Remove
HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID check.

diff --git a/configure.ac b/configure.ac
index 3aadc3066edd68624cabaf0c53bf76db5361dd9c..9afda736e87ecedcb090b8dc668ab5590e2769cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,11 +350,6 @@ AC_CHECK_MEMBERS([struct timex.tai],,, [#include <sys/timex.h>])
 
 AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
 
-AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
-[#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>])
-
 AC_CHECK_MEMBERS(m4_normalize([
        struct stat.st_atime_nsec,
        struct stat.st_ctime_nsec,

diff --git a/net.c b/net.c
index 4f177f5f4bc6d98de574ee58c7539d325542a61c..517ed23c16282c176a3a70673dfcce1f2c69746f 100644 (file)
--- a/net.c
+++ b/net.c
@@ -159,16 +159,14 @@ print_sockaddr_data_in6(const void *const buf, const int addrlen)
                ", \"%s\", &sin6_addr), sin6_flowinfo=%u",
                ntohs(sa_in6->sin6_port), string_addr,
                sa_in6->sin6_flowinfo);
-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
        tprints(", sin6_scope_id=");
-# if defined IN6_IS_ADDR_LINKLOCAL && defined IN6_IS_ADDR_MC_LINKLOCAL
+#if defined IN6_IS_ADDR_LINKLOCAL && defined IN6_IS_ADDR_MC_LINKLOCAL
        if (IN6_IS_ADDR_LINKLOCAL(&sa_in6->sin6_addr)
            || IN6_IS_ADDR_MC_LINKLOCAL(&sa_in6->sin6_addr))
                print_ifindex(sa_in6->sin6_scope_id);
        else
-# endif
+#endif
                tprintf("%u", sa_in6->sin6_scope_id);
-#endif /* HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID */
 }
 
 static void