Mercurial > cpython-lru_cache-weakref
diff Mac/Python/macimport.c @ 8789:d32dbc202613 legacy-trunk
The PYD resource should now contain 2 strings: one for the ppc
fragment name and one for the cfm68k fragment name (Just).
Also, some unused variables removed.
| author | Jack Jansen <jack.jansen@cwi.nl> |
|---|---|
| date | Fri, 31 Jul 1998 09:34:47 +0000 |
| parents | f594778a56af |
| children | ff1a8a38f8c1 |
line wrap: on
line diff
--- a/Mac/Python/macimport.c Fri Jul 31 09:33:28 1998 +0000 +++ b/Mac/Python/macimport.c Fri Jul 31 09:34:47 1998 +0000 @@ -122,8 +122,16 @@ ok = (h != NULL); if ( ok && dataptr != NULL ) { HLock(h); + /* XXXX Unsafe if resource not correctly formatted! */ +#ifdef __CFM68K__ + /* for cfm68k we take the second pstring */ + *dataptr = *((*h)+(**h)+1); + memcpy(dataptr+1, (*h)+(**h)+2, (int)*dataptr); +#else + /* for ppc we take the first pstring */ *dataptr = **h; memcpy(dataptr+1, (*h)+1, (int)*dataptr); +#endif HUnlock(h); } if ( filerh != -1 ) @@ -173,7 +181,7 @@ char *name; char *pathname; { - PyObject *m; + PyObject *m, *d, *s; char funcname[258]; char *lastdot, *shortname, *packagecontext; dl_funcptr p = NULL; @@ -246,7 +254,7 @@ "dynamic module not initialized properly"); return NULL; } -#if 0 +#if 1 /* Remember the filename as the __file__ attribute */ d = PyModule_GetDict(m); s = PyString_FromString(pathname);