Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jack Jansen 1998-07-31 09:34:47 +00:00
parent abdf93c6dc
commit 017e0ff1a0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mac/Python/macimport.c
View File

@ -122,8 +122,16 @@ findnamedresource(
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 @@ PyMac_LoadCodeResourceModule(name, pathname)
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 @@ PyMac_LoadCodeResourceModule(name, pathname)
"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);