commit 8fa1d027f23115dcb1c38b09c6e46edf5b8f7238
author David Lamparter <equinox@opensourcerouting.org> Tue Sep 15 21:55:38 2015 -0700
committer Martin Winter <mwinter@opensourcerouting.org> Fri Oct 16 23:50:47 2015 -0700
tree 73ed587d0f0967ee78e93f64d95be6ba3b9aaf68
parent ebd2687a531a0f9b9449f6fcf7001f53afa99d02

zebra/rt_socket: Fix warnings

Fix warning about unused sin_masklen / sin6_masklen

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

zebra/rt_socket.c

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index bf21ca9..a7ef457 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -41,6 +41,7 @@
                       union sockunion *mask, union sockunion *gate,
                       unsigned int index, int zebra_flags, int metric);
 
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
 /* Adjust netmask socket length. Return value is a adjusted sin_len
    value. */
 static int
@@ -63,6 +64,7 @@
     len--;
   return len;
 }
+#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
 
 /* Interface between zebra message and rtm message. */
 static int
@@ -244,6 +246,7 @@
 
 #ifdef HAVE_IPV6
 
+#ifdef SIN6_LEN
 /* Calculate sin6_len value for netmask socket value. */
 static int
 sin6_masklen (struct in6_addr mask)
@@ -266,6 +269,7 @@
 
   return len;
 }
+#endif /* SIN6_LEN */
 
 /* Interface between zebra message and rtm message. */
 static int
@@ -368,6 +372,8 @@
 	  zlog_info ("kernel_rtm_ipv6_multipath(): nexthop %d add error=%d.",
 	    nexthop_num, error);
 	}
+#else
+      (void)error;
 #endif
 
       nexthop_num++;