summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-04-24 15:08:18 (GMT)
committerGuido van Rossum <guido@python.org>2000-04-24 15:08:18 (GMT)
commitb33aa1a51e1a7a204c5ad41f812d02f249aa56eb (patch)
tree9a268202fb0092e033dc4077350021a88e27222d
parent095249fc8c972d95db304b29c52d9861d232f2cb (diff)
downloadcpython-b33aa1a51e1a7a204c5ad41f812d02f249aa56eb.zip
cpython-b33aa1a51e1a7a204c5ad41f812d02f249aa56eb.tar.gz
cpython-b33aa1a51e1a7a204c5ad41f812d02f249aa56eb.tar.bz2
Jack Jansen: The new version of the GUSI i/o library on the Macintosh
has a few slightly different calls from the old one.
-rw-r--r--Python/dynload_mac.c6
-rw-r--r--Python/import.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/Python/dynload_mac.c b/Python/dynload_mac.c
index 8846803..85ff014 100644
--- a/Python/dynload_mac.c
+++ b/Python/dynload_mac.c
@@ -40,7 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
#define CFragConnectionID ConnectionID
#define kLoadCFrag 0x01
#endif
-#ifdef USE_GUSI
+#ifdef USE_GUSI1
#include "TFileSpec.h" /* for Path2FSSpec() */
#endif
#include <Files.h>
@@ -78,7 +78,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
Ptr mainAddr;
Str255 errMessage;
OSErr err;
-#ifndef USE_GUSI
+#ifndef USE_GUSI1
Boolean isfolder, didsomething;
#endif
char buf[512];
@@ -87,7 +87,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
CFragSymbolClass class;
/* First resolve any aliases to find the real file */
-#ifdef USE_GUSI
+#ifdef USE_GUSI1
err = Path2FSSpec(pathname, &libspec);
#else
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
diff --git a/Python/import.c b/Python/import.c
index 88908a9..5340054 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1087,7 +1087,7 @@ check_case(char *buf, int len, int namelen, char *name)
#ifdef macintosh
#include <TextUtils.h>
-#ifdef USE_GUSI
+#ifdef USE_GUSI1
#include "TFileSpec.h" /* for Path2FSSpec() */
#endif
static int
@@ -1095,7 +1095,7 @@ check_case(char *buf, int len, int namelen, char *name)
{
FSSpec fss;
OSErr err;
-#ifndef USE_GUSI
+#ifndef USE_GUSI1
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
#else
/* GUSI's Path2FSSpec() resolves all possible aliases nicely on