From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 31 Jan 2015 01:14:39 +0000 (+0000)
Subject: net.c: remove unused HAVE_SIN6_SCOPE_ID_LINUX-based code
X-Git-Tag: v4.10~148
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f362a33660fd8f2bdfad9bf3985a08b8fd837f38;p=strace

net.c: remove unused HAVE_SIN6_SCOPE_ID_LINUX-based code

The AC_SIN6_SCOPE_ID autoconf macro that was able to define
HAVE_SIN6_SCOPE_ID_LINUX was removed by commit v4.4-98-g64f793a.

* net.c [HAVE_SIN6_SCOPE_ID_LINUX]: Remove.
---

diff --git a/net.c b/net.c
index e6e081db..49185dc0 100644
--- a/net.c
+++ b/net.c
@@ -33,11 +33,6 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/un.h>
-#if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-# define in6_addr in6_addr_libc
-# define ipv6_mreq ipv6_mreq_libc
-# define sockaddr_in6 sockaddr_in6_libc
-#endif
 #include <netinet/in.h>
 #ifdef HAVE_NETINET_TCP_H
 # include <netinet/tcp.h>
@@ -57,28 +52,6 @@
 # include <linux/ipx.h>
 #endif
 
-#if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
-# if defined(HAVE_LINUX_IN6_H)
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_kernel
-#   define ipv6_mreq ipv6_mreq_kernel
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-#  include <linux/in6.h>
-#  if defined(HAVE_SIN6_SCOPE_ID_LINUX)
-#   undef in6_addr
-#   undef ipv6_mreq
-#   undef sockaddr_in6
-#   define in6_addr in6_addr_libc
-#   define ipv6_mreq ipv6_mreq_libc
-#   define sockaddr_in6 sockaddr_in6_kernel
-#  endif
-# endif
-#endif
-
 #if defined(HAVE_LINUX_NETLINK_H)
 # include <linux/netlink.h>
 #endif