From 2e24081684fc65d968361614232d0c5b959475b8 Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Thu, 14 Mar 2002 23:31:03 +0000 Subject: [PATCH] Merged the Mac Pro 7 changes onto the trunk of NSPR. --- nsprpub/pr/src/md/mac/macdll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsprpub/pr/src/md/mac/macdll.c b/nsprpub/pr/src/md/mac/macdll.c index 2cfe79db8899..017f120089d6 100644 --- a/nsprpub/pr/src/md/mac/macdll.c +++ b/nsprpub/pr/src/md/mac/macdll.c @@ -218,7 +218,7 @@ GetSharedLibraryFilterProc(const CInfoPBRec* const inCpb, Boolean* inWantQuit, v // see if this symbol is in this fragment if (LibInPefContainer(&fragSpec, pFilterData->inName, &codeOffset, &codeLength)) - tempErr = GetDiskFragment(&fragSpec, codeOffset, codeLength, pFilterData->inName, kLoadCFrag, &pFilterData->outID, &pFilterData->outAddress, errName); + tempErr = GetDiskFragment(&fragSpec, codeOffset, codeLength, fragSpec.name, kLoadCFrag, &pFilterData->outID, &pFilterData->outAddress, errName); else return; @@ -512,7 +512,7 @@ OSErr NSLoadNamedFragment(const FSSpec *fileSpec, const char* fragmentName, CFra err = GetNamedFragmentOffsets(fileSpec, fragmentName, &fragOffset, &fragLength); if (err != noErr) return err; - err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, + err = GetDiskFragment(fileSpec, fragOffset, fragLength, fileSpec->name, kLoadCFrag, outConnectionID, &main, errName); return err; @@ -555,7 +555,7 @@ OSErr NSLoadIndexedFragment(const FSSpec *fileSpec, PRUint32 fragmentIndex, fragName[0] = nameLen; } - err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, + err = GetDiskFragment(fileSpec, fragOffset, fragLength, fileSpec->name, kLoadCFrag, outConnectionID, &main, errName); if (err != noErr) {