projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53400da
)
On some operating systems, MAX is defined. Call ours OSSL_MAX instead
author
Richard Levitte
<levitte@openssl.org>
Sun, 22 Oct 2000 12:44:12 +0000
(12:44 +0000)
committer
Richard Levitte
<levitte@openssl.org>
Sun, 22 Oct 2000 12:44:12 +0000
(12:44 +0000)
crypto/bio/b_print.c
patch
|
blob
|
history
diff --git
a/crypto/bio/b_print.c
b/crypto/bio/b_print.c
index a62f5516354811e8b5fa2cf870f370ce7d50a609..6a28c58f07408eef93b41c59a7167332e3d620ec 100644
(file)
--- 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')
/* 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(
static void
_dopr(
@@
-502,13
+502,13
@@
fmtint(
convert[place] = 0;
zpadlen = max - place;
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) {
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)
spadlen = 0;
}
if (flags & DP_F_MINUS)