diff options
| -rw-r--r-- | Python/errors.c | 2 | ||||
| -rw-r--r-- | Python/importdl.c | 5 | ||||
| -rw-r--r-- | Python/pythonmain.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 6f2f134..3c721b8 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -60,7 +60,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <errno.h> -#ifdef __CFM68K__ +#ifdef SYMANTEC__CFM68K__ #pragma lib_export on #endif diff --git a/Python/importdl.c b/Python/importdl.c index 189bc43..16b50af 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -151,7 +151,7 @@ typedef void (*dl_funcptr)(); #ifdef USE_MAC_DYNAMIC_LOADING #include <CodeFragments.h> -#ifdef __CFM68K__ /* Really just an older version of Universal Headers */ +#ifdef SYMANTEC__CFM68K__ /* Really just an older version of Universal Headers */ #define CFragConnectionID ConnectionID #define kLoadCFrag 0x01 #endif @@ -268,7 +268,10 @@ load_dynamic_module(name, pathname, fp) /* First resolve any aliases to find the real file */ (void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec); +#if !(defined(__MWERKS__) && defined(__CFM68K__)) + /* Bug: not in library */ err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething); +#endif if ( err ) { sprintf(buf, "%s: %s", pathname, PyMac_StrError(err)); err_setstr(ImportError, buf); diff --git a/Python/pythonmain.c b/Python/pythonmain.c index ac9ca2c..64aae7a 100644 --- a/Python/pythonmain.c +++ b/Python/pythonmain.c @@ -106,6 +106,8 @@ realmain(argc, argv) fprintf(stderr, "usage: %s [-d] [-i] [-s] [-u ] [-v] [-c cmd | file | -] [arg] ...\n", argv[0]); +#if !(defined(__CFM68K__) && defined(__MWERKS__)) + /* Mwerks cfm68k linker doesn't like these... */ fprintf(stderr, "\ \n\ Options and arguments (and corresponding environment variables):\n\ @@ -128,6 +130,7 @@ PYTHONSTARTUP: file executed on interactive startup (no default)\n\ PYTHONPATH : colon-separated list of directories prefixed to the\n\ default module search path. The result is sys.path.\n\ "); +#endif /* !cfm68k || !mwerks */ exit(2); /*NOTREACHED*/ |