[src/trunk]: src/sbin/routed PR/44647: commit fix proposed by Takahiro HAYASHI

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

details:   https://anonhg.NetBSD.org/src/rev/125091cfa1cc
branches:  trunk
changeset: 779878:125091cfa1cc
user:      kardel <kardel%NetBSD.org@localhost>
date:      Sun Jun 24 16:24:34 2012 +0000

description:
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 c40017a470eb -r 125091cfa1cc sbin/routed/if.c
--- a/sbin/routed/if.c  Sun Jun 24 15:26:02 2012 +0000
+++ b/sbin/routed/if.c  Sun Jun 24 16:24:34 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.30 2012/06/24 16:24:34 kardel 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.30 2012/06/24 16:24:34 kardel 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));