diff options
| author | wchang0222%aol.com <devnull@localhost> | 2003-10-25 14:08:31 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2003-10-25 14:08:31 +0000 |
| commit | 8a1aa7d481c4d69e6ed96ccdf241e8bb1edeca07 (patch) | |
| tree | 2eed176189d657656f332a356d3d5de7c4bf50e2 | |
| parent | eee2098bb1d39afa8b82507c06d3d3ea699cae87 (diff) | |
| download | nss-hg-8a1aa7d481c4d69e6ed96ccdf241e8bb1edeca07.tar.gz | |
Bugzilla bug 223624: use PR_MAX to avoid redefining MAX, a macro commonly
defined in system headers. r=nelsonb.
| -rw-r--r-- | security/nss/lib/certdb/alg1485.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/nss/lib/certdb/alg1485.c b/security/nss/lib/certdb/alg1485.c index d01b1a3f8..97640319f 100644 --- a/security/nss/lib/certdb/alg1485.c +++ b/security/nss/lib/certdb/alg1485.c @@ -449,7 +449,6 @@ typedef struct stringBufStr { } stringBuf; #define DEFAULT_BUFFER_SIZE 200 -#define MAX(x,y) ((x) > (y) ? (x) : (y)) static SECStatus AppendStr(stringBuf *bufp, char *str) @@ -465,7 +464,7 @@ AppendStr(stringBuf *bufp, char *str) bufSize = bufLen + len; if (!buf) { bufSize++; - size = MAX(DEFAULT_BUFFER_SIZE,bufSize*2); + size = PR_MAX(DEFAULT_BUFFER_SIZE,bufSize*2); buf = (char *) PORT_Alloc(size); bufp->size = size; } else if (bufp->size < bufSize) { |