summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-07-18 20:56:35 +0000
committermarkus <markus@openbsd.org>2001-07-18 20:56:35 +0000
commit61bc6e4152b29d3662d4f2c09a955f4a4ea541a2 (patch)
tree95fc5d0da99a415b6bd7c2df6ac746b945f4825b
parentminor updates. (diff)
downloadwireguard-openbsd-61bc6e4152b29d3662d4f2c09a955f4a4ea541a2.tar.xz
wireguard-openbsd-61bc6e4152b29d3662d4f2c09a955f4a4ea541a2.zip
protect #define MAX(); ok ho@
-rw-r--r--sbin/isakmpd/if.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/isakmpd/if.c b/sbin/isakmpd/if.c
index 3bbcbe59a0b..6d4569210ee 100644
--- a/sbin/isakmpd/if.c
+++ b/sbin/isakmpd/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.7 1999/10/01 14:08:26 niklas Exp $ */
+/* $OpenBSD: if.c,v 1.8 2001/07/18 20:56:35 markus Exp $ */
/* $EOM: if.c,v 1.12 1999/10/01 13:45:20 niklas Exp $ */
/*
@@ -47,7 +47,9 @@
#include "if.h"
/* XXX Unsafe if either x or y has side-effects. */
+#ifndef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
/* Most boxes has less than 16 interfaces, so this might be a good guess. */
#define INITIAL_IFREQ_COUNT 16