mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Jack Jansen: The new version of the GUSI i/o library on the Macintosh
has a few slightly different calls from the old one.
This commit is contained in:
parent
095249fc8c
commit
b33aa1a51e
2 changed files with 5 additions and 5 deletions
|
@ -40,7 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
|
||||||
#define CFragConnectionID ConnectionID
|
#define CFragConnectionID ConnectionID
|
||||||
#define kLoadCFrag 0x01
|
#define kLoadCFrag 0x01
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_GUSI
|
#ifdef USE_GUSI1
|
||||||
#include "TFileSpec.h" /* for Path2FSSpec() */
|
#include "TFileSpec.h" /* for Path2FSSpec() */
|
||||||
#endif
|
#endif
|
||||||
#include <Files.h>
|
#include <Files.h>
|
||||||
|
@ -78,7 +78,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
|
||||||
Ptr mainAddr;
|
Ptr mainAddr;
|
||||||
Str255 errMessage;
|
Str255 errMessage;
|
||||||
OSErr err;
|
OSErr err;
|
||||||
#ifndef USE_GUSI
|
#ifndef USE_GUSI1
|
||||||
Boolean isfolder, didsomething;
|
Boolean isfolder, didsomething;
|
||||||
#endif
|
#endif
|
||||||
char buf[512];
|
char buf[512];
|
||||||
|
@ -87,7 +87,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
|
||||||
CFragSymbolClass class;
|
CFragSymbolClass class;
|
||||||
|
|
||||||
/* First resolve any aliases to find the real file */
|
/* First resolve any aliases to find the real file */
|
||||||
#ifdef USE_GUSI
|
#ifdef USE_GUSI1
|
||||||
err = Path2FSSpec(pathname, &libspec);
|
err = Path2FSSpec(pathname, &libspec);
|
||||||
#else
|
#else
|
||||||
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
|
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
|
||||||
|
|
|
@ -1087,7 +1087,7 @@ check_case(char *buf, int len, int namelen, char *name)
|
||||||
|
|
||||||
#ifdef macintosh
|
#ifdef macintosh
|
||||||
#include <TextUtils.h>
|
#include <TextUtils.h>
|
||||||
#ifdef USE_GUSI
|
#ifdef USE_GUSI1
|
||||||
#include "TFileSpec.h" /* for Path2FSSpec() */
|
#include "TFileSpec.h" /* for Path2FSSpec() */
|
||||||
#endif
|
#endif
|
||||||
static int
|
static int
|
||||||
|
@ -1095,7 +1095,7 @@ check_case(char *buf, int len, int namelen, char *name)
|
||||||
{
|
{
|
||||||
FSSpec fss;
|
FSSpec fss;
|
||||||
OSErr err;
|
OSErr err;
|
||||||
#ifndef USE_GUSI
|
#ifndef USE_GUSI1
|
||||||
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
|
err = FSMakeFSSpec(0, 0, Pstring(buf), &fss);
|
||||||
#else
|
#else
|
||||||
/* GUSI's Path2FSSpec() resolves all possible aliases nicely on
|
/* GUSI's Path2FSSpec() resolves all possible aliases nicely on
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue