diff options
author | Richard Levitte <levitte@openssl.org> | 2000-10-22 12:44:12 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-10-22 12:44:12 +0000 |
commit | 99b1aaf2ecbc6d3bf498f64130ca6fd52d42baef (patch) | |
tree | 4265aef18f8c01bdfdb1c3da265a679b11317649 /crypto | |
parent | 53400da75c6b936634d06282910b9e2ed0d06301 (diff) | |
download | openssl-99b1aaf2ecbc6d3bf498f64130ca6fd52d42baef.tar.gz |
On some operating systems, MAX is defined. Call ours OSSL_MAX instead
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/bio/b_print.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index a62f551635..6a28c58f07 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c @@ -151,7 +151,7 @@ static void _dopr(char **sbuffer, char **buffer, /* some handy macros */ #define char_to_int(p) (p - '0') -#define MAX(p,q) ((p >= q) ? p : q) +#define OSSL_MAX(p,q) ((p >= q) ? p : q) static void _dopr( @@ -502,13 +502,13 @@ fmtint( convert[place] = 0; zpadlen = max - place; - spadlen = min - MAX(max, place) - (signvalue ? 1 : 0); + spadlen = min - OSSL_MAX(max, place) - (signvalue ? 1 : 0); if (zpadlen < 0) zpadlen = 0; if (spadlen < 0) spadlen = 0; if (flags & DP_F_ZERO) { - zpadlen = MAX(zpadlen, spadlen); + zpadlen = OSSL_MAX(zpadlen, spadlen); spadlen = 0; } if (flags & DP_F_MINUS) |