[PATCH 04/13] Remove check for struct ip_mreqn

Ruben Kerkhof ruben at rubenkerkhof.com
Sat Mar 18 17:25:34 CET 2017


It has been available since Linux 2.2
---
 aclocal.m4           | 12 ------------
 configure.ac         |  1 -
 sysdep/linux/sysio.h | 10 ----------
 3 files changed, 23 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 29049d18..d48846af 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -57,18 +57,6 @@ case "$bird_cv_type_time_t" in
 	esac
 ])
 
-AC_DEFUN([BIRD_CHECK_STRUCT_IP_MREQN],
-[AC_CACHE_CHECK([for struct ip_mreqn], bird_cv_struct_ip_mreqn,[
-AC_TRY_COMPILE([#include <netinet/in.h>
-],[struct ip_mreqn x;
-],[bird_cv_struct_ip_mreqn=yes
-],[bird_cv_struct_ip_mreqn=no
-])])
-if test "$bird_cv_struct_ip_mreqn" = yes ; then
-	AC_DEFINE([HAVE_STRUCT_IP_MREQN], [1], [Define to 1 if you have struct ip_mreqn])
-fi
-])
-
 AC_DEFUN([BIRD_CHECK_PTHREADS],
 [
   bird_tmp_cflags="$CFLAGS"
diff --git a/configure.ac b/configure.ac
index 840cc0ea..734768d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,6 @@ AC_C_BIGENDIAN(
 
 BIRD_CHECK_STRUCT_ALIGN
 BIRD_CHECK_TIME_T
-BIRD_CHECK_STRUCT_IP_MREQN
 
 if test "$enable_debug" = yes ; then
 	AC_DEFINE([DEBUGGING], [1], [Define to 1 if debugging is enabled])
diff --git a/sysdep/linux/sysio.h b/sysdep/linux/sysio.h
index 58644417..b1cc25dc 100644
--- a/sysdep/linux/sysio.h
+++ b/sysdep/linux/sysio.h
@@ -7,16 +7,6 @@
  */
 
 
-#ifndef HAVE_STRUCT_IP_MREQN
-/* Several versions of glibc don't define this structure, so we have to do it ourselves */
-struct ip_mreqn
-{
-  struct in_addr imr_multiaddr;			/* IP multicast address of group */
-  struct in_addr imr_address;			/* local IP address of interface */
-  int		 imr_ifindex;			/* Interface index */
-};
-#endif
-
 #ifndef IP_MINTTL
 #define IP_MINTTL 21
 #endif
-- 
2.12.0



More information about the Bird-users mailing list