diff options
Diffstat (limited to 'usr.sbin/smtpd/ber.c')
| -rw-r--r-- | usr.sbin/smtpd/ber.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/ber.c b/usr.sbin/smtpd/ber.c index 58c134c88ee..be19f726939 100644 --- a/usr.sbin/smtpd/ber.c +++ b/usr.sbin/smtpd/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.4 2013/12/26 17:25:32 eric Exp $ */ +/* $OpenBSD: ber.c,v 1.5 2015/01/16 06:40:20 deraadt Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net> @@ -19,7 +19,6 @@ */ #include <sys/types.h> -#include <sys/param.h> #include <errno.h> #include <limits.h> @@ -32,6 +31,7 @@ #include "ber.h" +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) #define BER_TYPE_CONSTRUCTED 0x20 /* otherwise primitive */ #define BER_TYPE_SINGLE_MAX 30 @@ -1164,7 +1164,7 @@ ber_readbuf(struct ber *b, void *buf, size_t nbytes) return -1; sz = b->br_rend - b->br_rptr; - len = MIN(nbytes, sz); + len = MINIMUM(nbytes, sz); if (len == 0) { errno = ECANCELED; return (-1); /* end of buffer and parser wants more data */ |