remove forward declarations. No constructors to move for these files. Makes
code work with C++ compilers.
diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c
index ffbc72b..88ce6c5 100644
--- a/Modules/xxsubtype.c
+++ b/Modules/xxsubtype.c
@@ -79,8 +79,6 @@
{NULL, NULL},
};
-static PyTypeObject spamlist_type;
-
static int
spamlist_init(spamlistobject *self, PyObject *args, PyObject *kwds)
{
@@ -179,8 +177,6 @@
{NULL, NULL},
};
-static PyTypeObject spamdict_type;
-
static int
spamdict_init(spamdictobject *self, PyObject *args, PyObject *kwds)
{
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 637dc48..3e37656 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -40,7 +40,6 @@
PyObject *files; /* dict with file info {path: toc_entry} */
};
-static PyTypeObject ZipImporter_Type;
static PyObject *ZipImportError;
static PyObject *zip_directory_cache = NULL;
@@ -958,7 +957,7 @@
PyObject *fixed_source;
/* one char extra for trailing \n and one for terminating \0 */
- buf = PyMem_Malloc(PyString_Size(source) + 2);
+ buf = (char *)PyMem_Malloc(PyString_Size(source) + 2);
if (buf == NULL) {
PyErr_SetString(PyExc_MemoryError,
"zipimport: no memory to allocate "