From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Wed, 12 Apr 2006 04:29:01 +0000 (+0000)
Subject: remove forward declarations. No constructors to move for these files. Makes
X-Git-Tag: v2.5a2~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6495b5944b9fd5ac3c142cf79957084f47a3024;p=python

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 ffbc72b165..88ce6c5bba 100644
--- a/Modules/xxsubtype.c
+++ b/Modules/xxsubtype.c
@@ -79,8 +79,6 @@ static PyMethodDef spamlist_methods[] = {
 	{NULL,	NULL},
 };
 
-static PyTypeObject spamlist_type;
-
 static int
 spamlist_init(spamlistobject *self, PyObject *args, PyObject *kwds)
 {
@@ -179,8 +177,6 @@ static PyMethodDef spamdict_methods[] = {
 	{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 637dc48aa5..3e376562f3 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -40,7 +40,6 @@ struct _zipimporter {
 	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 @@ normalize_line_endings(PyObject *source)
 	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 "