[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon Reduce previous

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

details:   https://anonhg.NetBSD.org/src/rev/abade495b4e8
branches:  trunk
changeset: 946399:abade495b4e8
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Nov 25 14:15:41 2020 +0000

description:
Reduce previous

diffstat:

 crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r b1e0abe1ed18 -r abade495b4e8 crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
--- a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c   Wed Nov 25 10:57:11 2020 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c   Wed Nov 25 14:15:41 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grabmyaddr.c,v 1.38 2020/11/25 10:57:11 kardel Exp $   */
+/*     $NetBSD: grabmyaddr.c,v 1.39 2020/11/25 14:15:41 christos Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * Copyright (C) 2008 Timo Teras <timo.teras%iki.fi@localhost>.
@@ -683,13 +683,11 @@
 
 #elif defined(USE_ROUTE)
 
-#ifdef RT_ROUNDUP
+#ifndef RT_ROUNDUP
+#define RT_ROUNDUP(a) \
+  ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
+#endif
 #define SAROUNDUP(X)   RT_ROUNDUP(((struct sockaddr *)(X))->sa_len)
-#else
-#define ROUNDUP(a) \
-  ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define SAROUNDUP(X)   ROUNDUP(((struct sockaddr *)(X))->sa_len)
-#endif
 
 
 static size_t