summaryrefslogtreecommitdiff
path: root/Modules/md5module.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-06-04 23:14:37 +0200
committerVictor Stinner <victor.stinner@gmail.com>2013-06-04 23:14:37 +0200
commit8362e4b8afd435ff62d89e6b69171cc382fadddc (patch)
tree68257533a9a5bd2e6b951c49053a1803c748f124 /Modules/md5module.c
parent87d6c6f82c851f48e4ddfb84dd5379bb8066e307 (diff)
downloadcpython-8362e4b8afd435ff62d89e6b69171cc382fadddc.tar.gz
Reuse Py_MIN and Py_MAX macros: remove duplicate MIN/MAX macros
multiprocessing.h: remove unused MIN and MAX macros
Diffstat (limited to 'Modules/md5module.c')
-rw-r--r--Modules/md5module.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/md5module.c b/Modules/md5module.c
index 6e15a20ac6..7dc38eaeed 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;