traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Silence two innocuous warnings (_File and _collections).
This commit is contained in:
Guido van Rossum 2007-07-25 16:47:51 +00:00
parent 3f6dd68e2a
commit 2f2fffb766
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mac/Modules/Nav.c
View File

@ -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*/

2
Mac/Modules/file/_Filemodule.c
View File

@ -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)) )

3
Mac/Modules/icgluemodule.c
View File

@ -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*/

2
Modules/_collectionsmodule.c
View File

@ -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);
}