Branch changes - update for new Universal Interfaces with CW7. CW7_20010609_BRANCH
authorccarlen%netscape.com
Mon, 02 Jul 2001 01:30:30 +0000
branchCW7_20010609_BRANCH
changeset 1990 8f87d2371371
parent 1989 2c85e7012e42
push idunknown
push userunknown
push dateunknown
Branch changes - update for new Universal Interfaces with CW7.
pr/src/md/mac/macio.c
pr/src/md/mac/macthr.c
--- a/pr/src/md/mac/macio.c
+++ b/pr/src/md/mac/macio.c
@@ -243,17 +243,17 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, vo
 	else
 	{
 		static IOCompletionUPP	sCompletionUPP = NULL;
 		
 		/* allocate the callback Universal Procedure Pointer (UPP). This actually allocates
 		   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;
 
 		pbAsync.pb.ioParam.ioCompletion	= sCompletionUPP;
 		pbAsync.pb.ioParam.ioResult		= noErr;
 		pbAsync.pb.ioParam.ioRefNum		= refNum;
 		pbAsync.pb.ioParam.ioBuffer		= buf;
--- a/pr/src/md/mac/macthr.c
+++ b/pr/src/md/mac/macthr.c
@@ -173,17 +173,17 @@ pascal void TimerCallback(TMTaskPtr tmTa
 }
 
 
 void _MD_StartInterrupts(void)
 {
 	gPrimaryThread = _PR_MD_CURRENT_THREAD();
 
 	if ( !gTimerCallbackUPP )
-		gTimerCallbackUPP = NewTimerProc(TimerCallback);
+		gTimerCallbackUPP = NewTimerUPP(TimerCallback);
 
 	//	Fill in the Time Manager queue element
 	
 	gTimeManagerTaskElem.tmAddr = (TimerUPP)gTimerCallbackUPP;
 	gTimeManagerTaskElem.tmCount = 0;
 	gTimeManagerTaskElem.tmWakeUp = 0;
 	gTimeManagerTaskElem.tmReserved = 0;