From: Richard Levitte <levitte@openssl.org>
Date: Sun, 22 Oct 2000 12:44:12 +0000 (+0000)
Subject: On some operating systems, MAX is defined.  Call ours OSSL_MAX instead
X-Git-Tag: BEFORE_engine~14
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=99b1aaf2ecbc6d3bf498f64130ca6fd52d42baef;ds=sidebyside

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

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)