diff options
Diffstat (limited to 'usr.sbin/ospf6d/rde.c')
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index b60d263e756..4e4154c1c20 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.62 2014/07/12 20:16:38 krw Exp $ */ +/* $OpenBSD: rde.c,v 1.63 2015/01/16 06:40:19 deraadt Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -18,7 +18,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> /* for MIN() */ #include <sys/types.h> #include <sys/socket.h> #include <sys/queue.h> @@ -40,6 +39,8 @@ #include "log.h" #include "rde.h" +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) + void rde_sig_handler(int sig, short, void *); void rde_shutdown(void); void rde_dispatch_imsg(int, short, void *); @@ -1315,7 +1316,7 @@ prefix_compare(struct prefix_node *a, struct prefix_node *b) p = a->prefix; q = b->prefix; - len = MIN(LSA_PREFIXSIZE(p->prefixlen), LSA_PREFIXSIZE(q->prefixlen)); + len = MINIMUM(LSA_PREFIXSIZE(p->prefixlen), LSA_PREFIXSIZE(q->prefixlen)); i = memcmp(p + 1, q + 1, len); if (i) |