Jack Jansen: The new version of the GUSI i/o library on the Macintosh

has a few slightly different calls from the old one.

diff --git a/Python/dynload_mac.c b/Python/dynload_mac.c
index 884680311ff34bf813359bb1fa440ca36468848c..85ff0144c76a4140f1cceebf34a0da43a0555c75 100644 (file)
--- 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 88908a96ae4a6fd9ade7926257ee8539c1f6e517..53400542fc6b4ecd6cfd8ff7d15111b4dce07d49 100644 (file)
--- 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