From c50ae8baf610d3d041fdedb78df205c999be57a9 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 11 May 2004 11:31:07 +0000 Subject: 2004-05-11 Paul Jakma * ioctl.h: Add if_ioctl_ipv6 prototype and AF_IOCTL for SOLARIS_IPV6 * kernel_socket.c: Fix SAROUNDUP, compiler doesnt like do..while RHS in assignments :) * redistribute.c: (zebra_interface_delete_update) only used if RTM_IFANNOUNCE and NETLINK is available. --- zebra/kernel_socket.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'zebra/kernel_socket.c') diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 9dd26157..20c6cc83 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -63,14 +63,12 @@ extern struct zebra_t zebrad; * but round them up nonetheless. */ #define SAROUNDUP(X) \ - do { \ (((struct sockaddr *)(X))->sa_family == AF_INET ? \ ROUNDUP(sizeof(struct sockaddr_in)):\ (((struct sockaddr *)(X))->sa_family == AF_INET6 ? \ ROUNDUP(sizeof(struct sockaddr_in6)) : \ (((struct sockaddr *)(X))->sa_family == AF_LINK ? \ - ROUNDUP(sizeof(struct sockaddr_dl)) : sizeof(struct sockaddr)))) \ - } while (0) + ROUNDUP(sizeof(struct sockaddr_dl)) : sizeof(struct sockaddr)))) #else /* HAVE_IPV6 */ #define SAROUNDUP(X) \ (((struct sockaddr *)(X))->sa_family == AF_INET ? \ -- cgit v1.2.1