diff options
Diffstat (limited to 'bin/md5/md5.c')
| -rw-r--r-- | bin/md5/md5.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/md5/md5.c b/bin/md5/md5.c index 33b31886fb0..e9d40e7ec8c 100644 --- a/bin/md5/md5.c +++ b/bin/md5/md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.c,v 1.77 2014/09/13 16:06:36 doug Exp $ */ +/* $OpenBSD: md5.c,v 1.78 2015/01/16 06:39:32 deraadt Exp $ */ /* * Copyright (c) 2001,2003,2005-2007,2010,2013,2014 @@ -48,8 +48,8 @@ #define MAX_DIGEST_LEN 128 -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define MAX(a,b) (((a)>(b))?(a):(b)) +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) +#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) union ANY_CTX { #if !defined(SHA2_ONLY) @@ -546,8 +546,8 @@ digest_filelist(const char *file, struct hash_function *defhash, int selcount, algorithm_max = algorithm_min = strlen(functions[0].name); for (hf = &functions[1]; hf->name != NULL; hf++) { len = strlen(hf->name); - algorithm_max = MAX(algorithm_max, len); - algorithm_min = MIN(algorithm_min, len); + algorithm_max = MAXIMUM(algorithm_max, len); + algorithm_min = MINIMUM(algorithm_min, len); } error = found = 0; |