Fix two bad type identifiers that caused crashes on OSX (icglue and Nav).

gvanrossum · gvanrossum · commit 2f2fffb76689 · 2007-07-25T16:47:51.000Z
Silence two innocuous warnings (_File and _collections).
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
@@ -403,8 +403,7 @@ static char Navrrtype__doc__[] =
 ;
 
 static PyTypeObject Navrrtype = {
-	PyObject_HEAD_INIT(&PyType_Type)
-	0,				/*ob_size*/
+	PyVarObject_HEAD_INIT(&PyType_Type, 0)
 	"Nav.NavReplyRecord",			/*tp_name*/
 	sizeof(navrrobject),		/*tp_basicsize*/
 	0,				/*tp_itemsize*/
diff --git a/Mac/Modules/file/_Filemodule.c b/Mac/Modules/file/_Filemodule.c
@@ -3193,7 +3193,7 @@ PyMac_GetFSRef(PyObject *v, FSRef *fsr)
 
         /* On OSX we now try a pathname */
         if ( PyString_Check(v) || PyUnicode_Check(v)) {
-                char *path = NULL;
+                unsigned char *path = NULL;
                 if (!PyArg_Parse(v, "et", Py_FileSystemDefaultEncoding, &path))
                         return 0;
                 if ( (err=FSPathMakeRef(path, fsr, NULL)) )
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
@@ -392,8 +392,7 @@ static char Icitype__doc__[] =
 ;
 
 static PyTypeObject Icitype = {
-	PyObject_HEAD_INIT(&PyType_Type)
-	0,				/*ob_size*/
+	PyVarObject_HEAD_INIT(&PyType_Type, 0)
 	"icglue.ic_instance",		/*tp_name*/
 	sizeof(iciobject),		/*tp_basicsize*/
 	0,				/*tp_itemsize*/
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
@@ -1103,7 +1103,7 @@ defdict_copy(defdictobject *dd)
 	   whose class constructor has the same signature.  Subclasses that
 	   define a different constructor signature must override copy().
 	*/
-	return PyObject_CallFunctionObjArgs(Py_Type(dd),
+	return PyObject_CallFunctionObjArgs((PyObject *)Py_Type(dd),
 					    dd->default_factory, dd, NULL);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -403,8 +403,7 @@ static char Navrrtype__doc__[] =`
`403`	`403`	`;`
`404`	`404`
`405`	`405`	`static PyTypeObject Navrrtype = {`
`406`		`- PyObject_HEAD_INIT(&PyType_Type)`
`407`		`- 0, /ob_size/`
	`406`	`+ PyVarObject_HEAD_INIT(&PyType_Type, 0)`
`408`	`407`	`"Nav.NavReplyRecord", /tp_name/`
`409`	`408`	`sizeof(navrrobject), /tp_basicsize/`
`410`	`409`	`0, /tp_itemsize/`
Original file line number	Diff line number	Diff line change
`@@ -392,8 +392,7 @@ static char Icitype__doc__[] =`
`392`	`392`	`;`
`393`	`393`
`394`	`394`	`static PyTypeObject Icitype = {`
`395`		`- PyObject_HEAD_INIT(&PyType_Type)`
`396`		`- 0, /ob_size/`
	`395`	`+ PyVarObject_HEAD_INIT(&PyType_Type, 0)`
`397`	`396`	`"icglue.ic_instance", /tp_name/`
`398`	`397`	`sizeof(iciobject), /tp_basicsize/`
`399`	`398`	`0, /tp_itemsize/`
Original file line number	Diff line number	Diff line change
`@@ -1103,7 +1103,7 @@ defdict_copy(defdictobject *dd)`
`1103`	`1103`	`whose class constructor has the same signature. Subclasses that`
`1104`	`1104`	`define a different constructor signature must override copy().`
`1105`	`1105`	`*/`
`1106`		`- return PyObject_CallFunctionObjArgs(Py_Type(dd),`
	`1106`	`+ return PyObject_CallFunctionObjArgs((PyObject *)Py_Type(dd),`
`1107`	`1107`	`dd->default_factory, dd, NULL);`
`1108`	`1108`	`}`
`1109`	`1109`