Module Name: src
Committed By: christos
Date: Wed Nov 25 14:15:41 UTC 2020
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: grabmyaddr.c
Log Message:
Reduce previous
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.38 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.39
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.38 Wed Nov 25 05:57:11 2020
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Wed Nov 25 09:15:41 2020
@@ -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 <[email protected]>.
@@ -683,13 +683,11 @@ kernel_sync()
#elif defined(USE_ROUTE)
-#ifdef RT_ROUNDUP
-#define SAROUNDUP(X) RT_ROUNDUP(((struct sockaddr *)(X))->sa_len)
-#else
-#define ROUNDUP(a) \
+#ifndef RT_ROUNDUP
+#define RT_ROUNDUP(a) \
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define SAROUNDUP(X) ROUNDUP(((struct sockaddr *)(X))->sa_len)
#endif
+#define SAROUNDUP(X) RT_ROUNDUP(((struct sockaddr *)(X))->sa_len)
static size_t
