diff options
author | sfraser%netscape.com <devnull@localhost> | 2001-12-10 22:27:32 +0000 |
---|---|---|
committer | sfraser%netscape.com <devnull@localhost> | 2001-12-10 22:27:32 +0000 |
commit | a47df1cefbbbd5c3c9dd2acd10d62cfd112dada7 (patch) | |
tree | c9bfe3fb804009bcfd061db20100e333be8f17c4 | |
parent | 0da5ce7e3444757b4b4f55495643618224219b87 (diff) | |
download | nspr-hg-a47df1cefbbbd5c3c9dd2acd10d62cfd112dada7.tar.gz |
Landing NSPR changes for the Mac Pro 7 landing
-rw-r--r-- | pr/src/io/prfile.c | 8 | ||||
-rw-r--r-- | pr/src/md/mac/macdll.c | 6 | ||||
-rw-r--r-- | pr/src/md/mac/macio.c | 2 | ||||
-rw-r--r-- | pr/src/md/mac/macthr.c | 2 | ||||
-rw-r--r-- | pr/src/md/mac/mdcriticalregion.c | 1 |
5 files changed, 10 insertions, 9 deletions
diff --git a/pr/src/io/prfile.c b/pr/src/io/prfile.c index e19705c7..c6da38a0 100644 --- a/pr/src/io/prfile.c +++ b/pr/src/io/prfile.c @@ -203,7 +203,7 @@ static PRStatus PR_CALLBACK PipeSync(PRFileDesc *fd) return PR_SUCCESS; } -static PRStatus PR_CALLBACK FileInfo(PRFileDesc *fd, PRFileInfo *info) +static PRStatus PR_CALLBACK FileGetInfo(PRFileDesc *fd, PRFileInfo *info) { PRInt32 rv; @@ -214,7 +214,7 @@ static PRStatus PR_CALLBACK FileInfo(PRFileDesc *fd, PRFileInfo *info) return PR_SUCCESS; } -static PRStatus PR_CALLBACK FileInfo64(PRFileDesc *fd, PRFileInfo64 *info) +static PRStatus PR_CALLBACK FileGetInfo64(PRFileDesc *fd, PRFileInfo64 *info) { #ifdef XP_MAC #pragma unused( fd, info ) @@ -276,8 +276,8 @@ static PRIOMethods _pr_fileMethods = { FileSync, FileSeek, FileSeek64, - FileInfo, - FileInfo64, + FileGetInfo, + FileGetInfo64, (PRWritevFN)_PR_InvalidInt, (PRConnectFN)_PR_InvalidStatus, (PRAcceptFN)_PR_InvalidDesc, diff --git a/pr/src/md/mac/macdll.c b/pr/src/md/mac/macdll.c index 2cfe79db..017f1200 100644 --- a/pr/src/md/mac/macdll.c +++ b/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) { diff --git a/pr/src/md/mac/macio.c b/pr/src/md/mac/macio.c index d1d58b2e..f09f9bc6 100644 --- a/pr/src/md/mac/macio.c +++ b/pr/src/md/mac/macio.c @@ -282,7 +282,7 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op) a 32 byte Ptr in the heap, so only do this once */ if (!sCompletionUPP) - sCompletionUPP = NewIOCompletionProc((IOCompletionProcPtr)&AsyncIOCompletion); + sCompletionUPP = NewIOCompletionUPP((IOCompletionProcPtr)&AsyncIOCompletion); /* grab the thread so we know which one to post to at completion */ pbAsync.thread = me; diff --git a/pr/src/md/mac/macthr.c b/pr/src/md/mac/macthr.c index 0df8a590..7cd16ccc 100644 --- a/pr/src/md/mac/macthr.c +++ b/pr/src/md/mac/macthr.c @@ -199,7 +199,7 @@ void _MD_StartInterrupts(void) gPrimaryThread = _PR_MD_CURRENT_THREAD(); if ( !gTimerCallbackUPP ) - gTimerCallbackUPP = NewTimerProc(TimerCallback); + gTimerCallbackUPP = NewTimerUPP(TimerCallback); // Fill in the Time Manager queue element diff --git a/pr/src/md/mac/mdcriticalregion.c b/pr/src/md/mac/mdcriticalregion.c index 927b9246..ff035d0d 100644 --- a/pr/src/md/mac/mdcriticalregion.c +++ b/pr/src/md/mac/mdcriticalregion.c @@ -35,6 +35,7 @@ */ #include "mdcriticalregion.h" +#include <MacErrors.h> /* This code is a replacement for MPEnterCriticalRegion/MPLeaveCriticalRegion, |