Module Name: src
Committed By: msaitoh
Date: Mon Nov 3 21:26:34 UTC 2014
Modified Files:
src/usr.sbin/route6d [netbsd-6]: route6d.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.4.1 src/usr.sbin/route6d/route6d.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/route6d/route6d.c
diff -u src/usr.sbin/route6d/route6d.c:1.66 src/usr.sbin/route6d/route6d.c:1.66.4.1
--- src/usr.sbin/route6d/route6d.c:1.66 Wed Aug 31 16:24:59 2011
+++ src/usr.sbin/route6d/route6d.c Mon Nov 3 21:26:34 2014
@@ -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 @@ __RCSID("$NetBSD: route6d.c,v 1.66 2011/
#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))
/*
