diff options
| author | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-06-04 21:36:07 (GMT) |
| commit | c97ec8fa6978657bfb8069db4128f785b29ea0aa (patch) | |
| tree | 46aa19c3d8f30869ec71ad17a39bc4275b5c4cf6 /Modules/md5module.c | |
| parent | af38f5a5032e49d527adcb9c594abfeba5d9b9b2 (diff) | |
| parent | 640c35ce135d71c6aafa13bb5985150f680416cc (diff) | |
| download | cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.zip cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.gz cpython-c97ec8fa6978657bfb8069db4128f785b29ea0aa.tar.bz2 | |
merge
Diffstat (limited to 'Modules/md5module.c')
| -rw-r--r-- | Modules/md5module.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/md5module.c b/Modules/md5module.c index 6e15a20..7dc38ea 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -91,10 +91,6 @@ typedef struct { (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255); \ (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); } -#ifndef MIN - #define MIN(x, y) ( ((x)<(y))?(x):(y) ) -#endif - /* MD5 macros */ @@ -244,7 +240,7 @@ md5_process(struct md5_state *md5, const unsigned char *in, Py_ssize_t inlen) in += MD5_BLOCKSIZE; inlen -= MD5_BLOCKSIZE; } else { - n = MIN(inlen, (Py_ssize_t)(MD5_BLOCKSIZE - md5->curlen)); + n = Py_MIN(inlen, (Py_ssize_t)(MD5_BLOCKSIZE - md5->curlen)); memcpy(md5->buf + md5->curlen, in, (size_t)n); md5->curlen += (MD5_INT32)n; in += n; |