[src/netbsd-6]: src/sbin/routed Pull up revision 1.30 (requested by kardel in...

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

details:   https://anonhg.NetBSD.org/src/rev/d5d040f59044
branches:  netbsd-6
changeset: 774282:d5d040f59044
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon Jul 02 21:28:08 2012 +0000

description:
Pull up revision 1.30 (requested by kardel in ticket #376).

PR/44647: commit fix proposed by Takahiro HAYASHI
verified to be working in -current and also helps NetBSD-6 BETA2

diffstat:

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

diffs (36 lines):

diff -r 284c7b6d0460 -r d5d040f59044 sbin/routed/if.c
--- a/sbin/routed/if.c  Mon Jul 02 21:20:52 2012 +0000
+++ b/sbin/routed/if.c  Mon Jul 02 21:28:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.29 2010/10/13 09:19:40 martin Exp $   */
+/*     $NetBSD: if.c,v 1.29.8.1 2012/07/02 21:28:08 jdc Exp $  */
 
 /*
  * Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
 #include "pathnames.h"
 
 #ifdef __NetBSD__
-__RCSID("$NetBSD: if.c,v 1.29 2010/10/13 09:19:40 martin Exp $");
+__RCSID("$NetBSD: if.c,v 1.29.8.1 2012/07/02 21:28:08 jdc Exp $");
 #elif defined(__FreeBSD__)
 __RCSID("$FreeBSD$");
 #else
@@ -641,6 +641,9 @@
 #ifdef _HAVE_SA_LEN
        static struct sockaddr sa_zero;
 #endif
+#if defined(__NetBSD__) && defined(RT_ROUNDUP)
+#define ROUNDUP(a) RT_ROUNDUP(a)
+#else
 #ifdef sgi
 #define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(__uint64_t) - 1))) \
                    : sizeof(__uint64_t))
@@ -648,6 +651,7 @@
 #define ROUNDUP(a) ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) \
                    : sizeof(long))
 #endif
+#endif /* defined(__NetBSD__) && defined(RT_ROUNDUP) */
 
 
        memset(info, 0, sizeof(*info));