diff options
| author | Guido van Rossum <guido@python.org> | 2007-07-25 16:47:51 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-07-25 16:47:51 (GMT) |
| commit | 2f2fffb76689df57a93366121f30e078738c552b (patch) | |
| tree | adc4b6d019d1f222530f059592d0804e84954031 | |
| parent | 3f6dd68e2a006ca5ef4161ca395a7503bfba2262 (diff) | |
| download | cpython-2f2fffb76689df57a93366121f30e078738c552b.zip cpython-2f2fffb76689df57a93366121f30e078738c552b.tar.gz cpython-2f2fffb76689df57a93366121f30e078738c552b.tar.bz2 | |
Fix two bad type identifiers that caused crashes on OSX (icglue and Nav).
Silence two innocuous warnings (_File and _collections).
| -rw-r--r-- | Mac/Modules/Nav.c | 3 | ||||
| -rw-r--r-- | Mac/Modules/file/_Filemodule.c | 2 | ||||
| -rw-r--r-- | Mac/Modules/icgluemodule.c | 3 | ||||
| -rw-r--r-- | Modules/_collectionsmodule.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c index 6786ea0..f3d8a48 100644 --- 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 index 8b4dd13..0ca9e3b 100644 --- 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 index fa50f0d..5ea6c72 100644 --- 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 index e454231..1ee3612 100644 --- 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); } |