generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

On some operating systems, MAX is defined. Call ours OSSL_MAX instead

Browse Source
This commit is contained in:
Richard Levitte 2000-10-22 12:44:12 +00:00
parent 53400da75c
commit 99b1aaf2ec
1 changed files with 3 additions and 3 deletions

6
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)