Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source smallicon.c,1.2,1.3 sounds.c,1.2,1.3 frontierwindows.c,1.2,1.3 scrap.c,1.2,1.3 threads.c,1.2,1.3
|
From: Andre R. <and...@us...> - 2004-10-31 16:46:01
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27622 Modified Files: smallicon.c sounds.c frontierwindows.c scrap.c threads.c Log Message: Fixed GCC compiler warnings. Index: sounds.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/sounds.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sounds.c 23 Oct 2004 22:58:10 -0000 1.2 --- sounds.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 167,173 **** Beep(1000, 500); #endif ! /* ! dosound (1 /*duration%/, 250 /*amplitude%/, 14300 /*frequency%/); ! */ } /*ouch*/ --- 167,173 ---- Beep(1000, 500); #endif ! ! //dosound (1 /*duration*/, 250 /*amplitude*/, 14300 /*frequency*/); ! } /*ouch*/ Index: smallicon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/smallicon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** smallicon.c 23 Oct 2004 22:57:57 -0000 1.2 --- smallicon.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 40,44 **** ! static hdlsmalliconbits hmiscbits, hleaderbits; #ifndef version42orgreater --- 40,45 ---- ! static hdlsmalliconbits hmiscbits; ! //static hdlsmalliconbits hleaderbits; #ifndef version42orgreater Index: scrap.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scrap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** scrap.c 23 Oct 2004 22:50:33 -0000 1.2 --- scrap.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 399,403 **** --i; ! } /*while*/ ctbytes = strlen (pdata); /*7.1b23: call strlen to find the first terminator: removes junk from end*/ --- 399,404 ---- --i; ! } /%while%/ ! */ ctbytes = strlen (pdata); /*7.1b23: call strlen to find the first terminator: removes junk from end*/ Index: frontierwindows.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/frontierwindows.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** frontierwindows.c 23 Oct 2004 22:21:14 -0000 1.2 --- frontierwindows.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 96,100 **** if (fldialog) { ! DialogPtr theDial = GetNewDialog (id, nil, (DialogPtr) -1L); w = GetDialogWindow(theDial); } --- 96,100 ---- if (fldialog) { ! DialogPtr theDial = GetNewDialog (id, nil, (WindowRef) -1L); w = GetDialogWindow(theDial); } Index: threads.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/threads.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** threads.c 23 Oct 2004 23:05:20 -0000 1.2 --- threads.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 88,96 **** --- 88,100 ---- static pascal void copythreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif (*threadcallbacks.swapoutcallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*copythreadcontext*/ *************** *** 98,106 **** --- 102,114 ---- static pascal void swapinthreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif (*threadcallbacks.swapincallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*swapinthreadcontext*/ *************** *** 108,127 **** static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { long curA5 = SetUpAppA5 (); //Code change by Timothy Paustian Thursday, May 11, 2000 4:44:59 PM //Get rid of the UPPs for carbon here #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock(globals); DisposeThreadSwitchUPP((**globals).threadInCallbackUPP); DisposeThreadSwitchUPP((**globals).threadOutCallbackUPP); DisposeThreadTerminationUPP((**globals).threadTerminateUPP); DisposeThreadEntryUPP((**globals).threadEntryCallbackUPP); ! HUnlock(globals); #endif (*threadcallbacks.disposecallback) (hglobals); RestoreA5 (curA5); } /*disposethreadcontext*/ --- 116,139 ---- static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif //Code change by Timothy Paustian Thursday, May 11, 2000 4:44:59 PM //Get rid of the UPPs for carbon here #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock((Handle) globals); DisposeThreadSwitchUPP((**globals).threadInCallbackUPP); DisposeThreadSwitchUPP((**globals).threadOutCallbackUPP); DisposeThreadTerminationUPP((**globals).threadTerminateUPP); DisposeThreadEntryUPP((**globals).threadEntryCallbackUPP); ! HUnlock((Handle) globals); #endif (*threadcallbacks.disposecallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*disposethreadcontext*/ *************** *** 136,140 **** #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock(globals); (**globals).threadInCallbackUPP = NewThreadSwitchUPP(&swapinthreadcontext); (**globals).threadOutCallbackUPP = NewThreadSwitchUPP(©threadcontext); --- 148,152 ---- #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock((Handle) globals); (**globals).threadInCallbackUPP = NewThreadSwitchUPP(&swapinthreadcontext); (**globals).threadOutCallbackUPP = NewThreadSwitchUPP(©threadcontext); *************** *** 147,151 **** SetThreadTerminator (idthread, (**globals).threadTerminateUPP, hglobals); ! HUnlock(globals); #else --- 159,163 ---- SetThreadTerminator (idthread, (**globals).threadTerminateUPP, hglobals); ! HUnlock((Handle) globals); #else |
