Added some missing PyObject* casts in the deallocators.

Jim Fulton · Jim Fulton · commit 1f325562f024 · 2003-05-16T13:53:43.000Z
Added some defines for PyMODINIT_FUNC so that the examples work
with Python 2.2.

I think I'm done hacking this documentation. Yippie! :)
diff --git a/Doc/ext/noddy.c b/Doc/ext/noddy.c
@@ -51,6 +51,9 @@ static PyMethodDef noddy_methods[] = {
     {NULL}  /* Sentinel */
 };
 
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
 PyMODINIT_FUNC
 initnoddy(void) 
 {
diff --git a/Doc/ext/noddy2.c b/Doc/ext/noddy2.c
@@ -13,7 +13,7 @@ Noddy_dealloc(Noddy* self)
 {
     Py_XDECREF(self->first);
     Py_XDECREF(self->last);
-    self->ob_type->tp_free(self);
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 static PyObject *
@@ -167,6 +167,9 @@ static PyMethodDef module_methods[] = {
     {NULL}  /* Sentinel */
 };
 
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
 PyMODINIT_FUNC
 initnoddy2(void) 
 {
diff --git a/Doc/ext/noddy3.c b/Doc/ext/noddy3.c
@@ -13,7 +13,7 @@ Noddy_dealloc(Noddy* self)
 {
     Py_XDECREF(self->first);
     Py_XDECREF(self->last);
-    self->ob_type->tp_free(self);
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 static PyObject *
@@ -220,6 +220,9 @@ static PyMethodDef module_methods[] = {
     {NULL}  /* Sentinel */
 };
 
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
 PyMODINIT_FUNC
 initnoddy3(void) 
 {

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ static PyMethodDef noddy_methods[] = {`
`51`	`51`	`{NULL} /* Sentinel */`
`52`	`52`	`};`
`53`	`53`
	`54`	`+#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */`
	`55`	`+#define PyMODINIT_FUNC void`
	`56`	`+#endif`
`54`	`57`	`PyMODINIT_FUNC`
`55`	`58`	`initnoddy(void)`
`56`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ Noddy_dealloc(Noddy* self)`
`13`	`13`	`{`
`14`	`14`	`Py_XDECREF(self->first);`
`15`	`15`	`Py_XDECREF(self->last);`
`16`		`- self->ob_type->tp_free(self);`
	`16`	`+ self->ob_type->tp_free((PyObject*)self);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`static PyObject *`
`@@ -167,6 +167,9 @@ static PyMethodDef module_methods[] = {`
`167`	`167`	`{NULL} /* Sentinel */`
`168`	`168`	`};`
`169`	`169`
	`170`	`+#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */`
	`171`	`+#define PyMODINIT_FUNC void`
	`172`	`+#endif`
`170`	`173`	`PyMODINIT_FUNC`
`171`	`174`	`initnoddy2(void)`
`172`	`175`	`{`