C++ compiler cleanup: a cast here, a cast there... still does not compile under C...

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 4551342f455bd6940a7a9920fcda8a9d01a6056b..52a7f5ee052022c9c50c50c94cce5ddea1d6537d 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1164,7 +1164,7 @@ array_reverse(arrayobject *self, PyObject *unused)
        register char *p, *q;
        /* little buffer to hold items while swapping */
        char tmp[256];  /* 8 is probably enough -- but why skimp */
-       assert(itemsize <= sizeof(tmp));
+       assert((size_t)itemsize <= sizeof(tmp));
 
        if (self->ob_size > 1) {
                for (p = self->ob_item,
@@ -1674,7 +1674,8 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
                        }
 
                        self->ob_size -= slicelength;
-                       self->ob_item = PyMem_REALLOC(self->ob_item, itemsize*self->ob_size);
+                       self->ob_item = (char *)PyMem_REALLOC(self->ob_item,
+                                                             itemsize*self->ob_size);
                        self->allocated = self->ob_size;
 
                        return 0;
@@ -1866,7 +1867,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                                if (n > 0) {
                                        arrayobject *self = (arrayobject *)a;
                                        char *item = self->ob_item;
-                                       item = PyMem_Realloc(item, n);
+                                       item = (char *)PyMem_Realloc(item, n);
                                        if (item == NULL) {
                                                PyErr_NoMemory();
                                                Py_DECREF(a);