renamed Get routines to PyMac_Get; added macfs to config.c
diff --git a/Mac/Modules/config.c b/Mac/Modules/config.c
index b1b7779..e7418eb 100644
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -261,10 +261,9 @@
extern void initdl();
extern void initsyslog();
extern void initgestalt();
-#ifdef THINK_C
extern void initmacconsole();
-#endif
extern void initctb();
+extern void initmacfs();
extern void initmacspeech();
extern void initmacdnr();
extern void initmactcp();
@@ -302,6 +301,7 @@
{"macconsole", initmacconsole},
#endif
{"ctb", initctb},
+ {"macfs", initmacfs},
#ifdef __MWERKS__
/* This is really "Jack Jansen" specific for now :-) */
{"macspeech", initmacspeech},
diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index 014ff6b..3ef337f 100644
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -48,7 +48,7 @@
FSSpec src, dst, *dstptr;
src.name[0] = 0;
- if (!newgetargs(args, "O&|O&", GetFSSpec, &dst, GetFSSpec, &src))
+ if (!newgetargs(args, "O&|O&", PyMac_GetFSSpec, &dst, PyMac_GetFSSpec, &src))
return NULL;
/* XXXX */
@@ -90,7 +90,7 @@
StandardFileReply reply;
dft[0] = 0;
- if (!newgetargs(args, "O&|O&", GetStr255, &prompt, GetStr255, &dft) )
+ if (!newgetargs(args, "O&|O&", PyMac_GetStr255, &prompt, PyMac_GetStr255, &dft) )
return NULL;
StandardPutFile(prompt, dft, &reply);
return mkvalue("(iO)", reply.sfGood, PyMac_BuildFSSpec(&reply.sfFile));
@@ -126,7 +126,7 @@
{
FSSpec fss;
- if (!newgetargs(args, "O&", GetFSSpec, &fss))
+ if (!newgetargs(args, "O&", PyMac_GetFSSpec, &fss))
return NULL;
return PyMac_BuildFSSpec(&fss);
}
@@ -140,7 +140,7 @@
char strbuf[257];
OSErr err;
- if (!newgetargs(args, "O&", GetFSSpec, &fss))
+ if (!newgetargs(args, "O&", PyMac_GetFSSpec, &fss))
return NULL;
err = nfullpath(&fss, strbuf);
if ( err ) {
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 833ef42..215fd72 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -157,7 +157,7 @@
ResType rt;
int id;
Handle h;
- if (!PyArg_ParseTuple(args, "O&i", GetOSType, &rt, &id))
+ if (!PyArg_ParseTuple(args, "O&i", PyMac_GetOSType, &rt, &id))
return NULL;
h = GetResource(rt, id);
return (PyObject *)Rsrc_FromHandle(h);
@@ -169,7 +169,7 @@
ResType rt;
Str255 name;
Handle h;
- if (!PyArg_ParseTuple(args, "O&O&", GetOSType, &rt, GetStr255, &name))
+ if (!PyArg_ParseTuple(args, "O&O&", PyMac_GetOSType, &rt, PyMac_GetStr255, &name))
return NULL;
h = GetNamedResource(rt, name);
return (PyObject *)Rsrc_FromHandle(h);
@@ -186,7 +186,7 @@
PyObject *type, *creator, *res;
OSErr err;
- if (!PyArg_ParseTuple(args, "O&", GetStr255, &name))
+ if (!PyArg_ParseTuple(args, "O&", PyMac_GetStr255, &name))
return NULL;
if ((err = GetFInfo(name, 0, &info)) != noErr) {
errno = err;
@@ -210,7 +210,7 @@
OSErr err;
if (!PyArg_ParseTuple(args, "O&O&O&",
- GetStr255, &name, GetOSType, &type, GetOSType, &creator))
+ PyMac_GetStr255, &name, PyMac_GetOSType, &type, PyMac_GetOSType, &creator))
return NULL;
if ((err = GetFInfo(name, 0, &info)) != noErr) {
errno = err;