Merged revisions 78189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78189 | mark.dickinson | 2010-02-14 13:40:30 +0000 (Sun, 14 Feb 2010) | 1 line
Silence more 'comparison between signed and unsigned' warnings.
........
diff --git a/Include/pymem.h b/Include/pymem.h
index 966c0f5..10b5bea 100644
--- a/Include/pymem.h
+++ b/Include/pymem.h
@@ -90,10 +90,10 @@
*/
#define PyMem_New(type, n) \
- ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+ ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
#define PyMem_NEW(type, n) \
- ( ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+ ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
/*
@@ -103,10 +103,10 @@
* caller's memory error handler to not lose track of it.
*/
#define PyMem_Resize(p, type, n) \
- ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+ ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
(type *) PyMem_Realloc((p), (n) * sizeof(type)) )
#define PyMem_RESIZE(p, type, n) \
- ( (p) = ((n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
+ ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \
(type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used