Fix two bad type identifiers that caused crashes on OSX (icglue and Nav).
Silence two innocuous warnings (_File and _collections).
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 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 @@
/* 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 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*/