[src/netbsd-6]: src/usr.sbin/route6d Pull up following revision(s) (requested...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79fb1a835ccc
branches:  netbsd-6
changeset: 776759:79fb1a835ccc
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Nov 03 21:26:34 2014 +0000

description:
Pull up following revision(s) (requested by gdt in ticket #1164):
        usr.sbin/route6d/route6d.c: revision 1.67
reenable routing functionality by using RT_ROUNDUP for ROUNDUP when available

diffstat:

 usr.sbin/route6d/route6d.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 979a872e4eee -r 79fb1a835ccc usr.sbin/route6d/route6d.c
--- a/usr.sbin/route6d/route6d.c        Mon Nov 03 21:22:28 2014 +0000
+++ b/usr.sbin/route6d/route6d.c        Mon Nov 03 21:26:34 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route6d.c,v 1.66 2011/08/31 16:24:59 plunky Exp $      */
+/*     $NetBSD: route6d.c,v 1.66.4.1 2014/11/03 21:26:34 msaitoh Exp $ */
 /*     $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $        */
 
 /*
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef        lint
-__RCSID("$NetBSD: route6d.c,v 1.66 2011/08/31 16:24:59 plunky Exp $");
+__RCSID("$NetBSD: route6d.c,v 1.66.4.1 2014/11/03 21:26:34 msaitoh Exp $");
 #endif
 
 #include <stdbool.h>
@@ -83,8 +83,12 @@
 #endif
 
 /* alignment constraint for routing socket */
+#if defined(__NetBSD__) && defined(RT_ROUNDUP)
+#define ROUNDUP(a) RT_ROUNDUP(a)
+#else
 #define ROUNDUP(a) \
        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
+#endif
 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 
 /*