diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-18 20:56:36 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-07-18 20:56:36 +0000 |
| commit | 266d36032c6d26661a6be7c5e14a29120c215814 (patch) | |
| tree | 9e049756401f7b61942af8b62359fafeca0eab0f | |
| parent | 38f10340347a7c578cdc0aa467c0e4b5fb7d4a71 (diff) | |
protect #define MAX(); ok ho@
| -rw-r--r-- | sbin/isakmpd/if.c | 4 |
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 |