Menu
▾
▴
[frontierkernel-commits] Frontier/Common/IowaRuntime/Source iowaruntime.c,1.2,1.3 iowavalidate.c,1.2,1.3 iowafrontier.c,1.2,1.3 iowaattributes.c,1.2,1.3 iowacomponent.c,1.2,1.3 iowacore.c,1.2,1.3
|
From: Andre R. <and...@us...> - 2004-10-29 20:38:31
|
Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13137 Modified Files: iowaruntime.c iowavalidate.c iowafrontier.c iowaattributes.c iowacomponent.c iowacore.c Log Message: Fixed GCC compiler warnings. Index: iowaruntime.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaruntime.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowaruntime.c 23 Oct 2004 21:43:04 -0000 1.2 --- iowaruntime.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 83,94 **** - - - - - static void defaultActivate (boolean flactivate) { - } /*defaultActivate*/ - - static short sizewindowarray (void) { --- 83,86 ---- *************** *** 2180,2184 **** --- 2172,2178 ---- */ + #if !TARGET_API_MAC_CARBON long curA5 = SetUpAppA5 (); + #endif IACglobals.event = (AppleEvent *) event; *************** *** 2233,2239 **** break; } /*switch*/ ! RestoreA5 (curA5); ! return (noErr); } /*appleEventHandler*/ --- 2227,2235 ---- break; } /*switch*/ ! ! #if !TARGET_API_MAC_CARBON RestoreA5 (curA5); ! #endif ! return (noErr); } /*appleEventHandler*/ Index: iowafrontier.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowafrontier.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowafrontier.c 23 Oct 2004 21:42:31 -0000 1.2 --- iowafrontier.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 322,326 **** ! boolean findfrontiercomponent () { return (findlangcomponent (idfrontier) != 0); --- 322,326 ---- ! boolean findfrontiercomponent (void) { return (findlangcomponent (idfrontier) != 0); *************** *** 512,516 **** /* ! if (equalstrings (tablename, lasttablename) && (lasttablewasmajor || !flmajorswitch)) /*minimize AE traffic%/ return (true); --- 512,516 ---- /* ! if (equalstrings (tablename, lasttablename) && (lasttablewasmajor || !flmajorswitch)) /%minimize AE traffic%/ return (true); Index: iowavalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowavalidate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowavalidate.c 23 Oct 2004 21:43:27 -0000 1.2 --- iowavalidate.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 76,80 **** static boolean validateobjectlist (hdlobject hlist) { - hdlcard hc = iowadata; hdlobject h = hlist; --- 76,79 ---- *************** *** 203,207 **** #endif ! if (thePort != (**iowadata).drawwindow) /*dmb 1.31.96: use quickdrawglobal*/ invalid ("\pdrawing into the wrong port"); } --- 202,206 ---- #endif ! if (thePort != (CGrafPtr) (**iowadata).drawwindow) /*dmb 1.31.96: use quickdrawglobal*/ invalid ("\pdrawing into the wrong port"); } Index: iowaattributes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaattributes.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowaattributes.c 23 Oct 2004 21:41:41 -0000 1.2 --- iowaattributes.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 44,51 **** #include "iowaruntime.h" - static hdlruntimerecord oldruntimedata = nil; - - static hdlcard oldiowadata = nil; - #endif --- 44,47 ---- *************** *** 107,110 **** --- 103,108 ---- + #if 0 + static boolean IACpushobjectparam (hdlobject hobject, OSType keyword) { *************** *** 124,127 **** --- 122,127 ---- } /*IACpushobjectparam*/ + #endif + boolean IACgetobjectattributes (Handle objectname) { Index: iowacore.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowacore.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowacore.c 23 Oct 2004 21:42:20 -0000 1.2 --- iowacore.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 1590,1593 **** --- 1590,1595 ---- } /*checkrectoperation*/ + + #if 0 static boolean trackingandhot (void) { *************** *** 1595,1598 **** --- 1597,1602 ---- return ((**iowadata).tracking && (**iowadata).trackerpressed); } /*trackingandhot*/ + + #endif *************** *** 2569,2573 **** } /*runbuttonscript*/ ! static boolean afterclonevisit (hdlobject h) { --- 2573,2579 ---- } /*runbuttonscript*/ ! ! #if 0 ! static boolean afterclonevisit (hdlobject h) { *************** *** 2579,2582 **** --- 2585,2590 ---- return (true); } /*afterclonevisit*/ + + #endif Index: iowacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowacomponent.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iowacomponent.c 23 Oct 2004 21:41:53 -0000 1.2 --- iowacomponent.c 29 Oct 2004 20:38:21 -0000 1.3 *************** *** 118,122 **** #define getconfigGlueParamSize (sizeof (config)) ! struct getconfigGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 118,122 ---- #define getconfigGlueParamSize (sizeof (config)) ! struct getconfigGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 136,140 **** #if TARGET_API_MAC_CARBON == 1 { ! return CallComponentDispatch(&pb); } #else --- 136,140 ---- #if TARGET_API_MAC_CARBON == 1 { ! return CallComponentDispatch((ComponentParameters*) &pb); } #else *************** *** 165,169 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 165,169 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 176,180 **** #define initobjectGlueParamSize (sizeof (obj)) ! struct initobjectGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 176,180 ---- #define initobjectGlueParamSize (sizeof (obj)) ! struct initobjectGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 193,197 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 193,197 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 204,208 **** #define debugGlueParamSize (sizeof (h) + sizeof (errorstring)) ! struct debugGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 204,208 ---- #define debugGlueParamSize (sizeof (h) + sizeof (errorstring)) ! struct debugGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 223,227 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 223,227 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 234,238 **** #define clickGlueParamSize (sizeof (listhead) + sizeof (h) + sizeof (pt) + sizeof (short) + sizeof (short)) ! struct clickGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 234,238 ---- #define clickGlueParamSize (sizeof (listhead) + sizeof (h) + sizeof (pt) + sizeof (short) + sizeof (short)) ! struct clickGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 261,265 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 261,265 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 272,276 **** #define cleanGlueParamSize (sizeof (h) + sizeof (height) + sizeof (width) + sizeof (r)) ! struct cleanGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 272,276 ---- #define cleanGlueParamSize (sizeof (h) + sizeof (height) + sizeof (width) + sizeof (r)) ! struct cleanGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 295,299 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 295,299 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 306,310 **** #define recalcGlueParamSize (sizeof (h) + sizeof (short)) ! struct recalcGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 306,310 ---- #define recalcGlueParamSize (sizeof (h) + sizeof (short)) ! struct recalcGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 326,330 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 326,330 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 337,341 **** #define editGlueParamSize (sizeof (h) + sizeof (short)) ! struct editGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 337,341 ---- #define editGlueParamSize (sizeof (h) + sizeof (short)) ! struct editGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 357,361 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 357,361 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 368,372 **** #define keyGlueParamSize (sizeof (h) + sizeof (ch)) ! struct keyGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 368,372 ---- #define keyGlueParamSize (sizeof (h) + sizeof (ch)) ! struct keyGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 387,391 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 387,391 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 398,402 **** #define idleGlueParamSize (sizeof (h)) ! struct idleGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 398,402 ---- #define idleGlueParamSize (sizeof (h)) ! struct idleGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 415,419 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 415,419 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 426,430 **** #define getvalueGlueParamSize (sizeof (h) + sizeof (r)) ! struct getvalueGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 426,430 ---- #define getvalueGlueParamSize (sizeof (h) + sizeof (r)) ! struct getvalueGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 445,449 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 445,449 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 456,460 **** #define setvalueGlueParamSize (sizeof (h) + sizeof (hvalue)) ! struct setvalueGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 456,460 ---- #define setvalueGlueParamSize (sizeof (h) + sizeof (hvalue)) ! struct setvalueGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 475,479 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 475,479 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 486,490 **** #define setcursorGlueParamSize (sizeof (h) + sizeof (pt)) ! struct setcursorGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 486,490 ---- #define setcursorGlueParamSize (sizeof (h) + sizeof (pt)) ! struct setcursorGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 505,509 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 505,509 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 516,520 **** #define unpackdataGlueParamSize (sizeof (h)) ! struct unpackdataGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 516,520 ---- #define unpackdataGlueParamSize (sizeof (h)) ! struct unpackdataGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 533,537 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 533,537 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 544,548 **** #define getattributesGlueParamSize (sizeof (h) + sizeof (event)) ! struct getattributesGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 544,548 ---- #define getattributesGlueParamSize (sizeof (h) + sizeof (event)) ! struct getattributesGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 563,567 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 563,567 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 574,578 **** #define setattributesGlueParamSize (sizeof (h) + sizeof (event)) ! struct setattributesGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 574,578 ---- #define setattributesGlueParamSize (sizeof (h) + sizeof (event)) ! struct setattributesGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 593,597 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 593,597 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 599,602 **** --- 599,603 ---- } /*setattributesGlue*/ + #ifndef iowaRuntime static pascal ComponentResult geticonGlue (ComponentInstance comp, Handle *h) { *************** *** 604,608 **** #define geticonGlueParamSize (sizeof (h)) ! struct geticonGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 605,609 ---- #define geticonGlueParamSize (sizeof (h)) ! struct geticonGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 621,629 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); #endif } /*geticonGlue*/ --- 622,632 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); #endif } /*geticonGlue*/ + + #endif *************** *** 632,636 **** #define getcardGlueParamSize (sizeof (hcard)) ! struct getcardGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 635,639 ---- #define getcardGlueParamSize (sizeof (hcard)) ! struct getcardGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 649,653 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 652,656 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 660,664 **** #define packdataGlueParamSize (sizeof (h) + sizeof (hpackeddata)) ! struct packdataGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 663,667 ---- #define packdataGlueParamSize (sizeof (h) + sizeof (hpackeddata)) ! struct packdataGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 679,683 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 682,686 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 690,694 **** #define disposedataGlueParamSize (sizeof (h)) ! struct disposedataGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 693,697 ---- #define disposedataGlueParamSize (sizeof (h)) ! struct disposedataGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 707,711 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 710,714 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 718,722 **** #define canreplicateGlueParamSize (sizeof (h)) ! struct canreplicateGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 721,725 ---- #define canreplicateGlueParamSize (sizeof (h)) ! struct canreplicateGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 735,739 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 738,742 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 746,750 **** #define catchreturnGlueParamSize (sizeof (h)) ! struct catchreturnGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 749,753 ---- #define catchreturnGlueParamSize (sizeof (h)) ! struct catchreturnGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 763,767 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 766,770 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 774,778 **** #define getinvalrectGlueParamSize (sizeof (h) + sizeof (r)) ! struct getinvalrectGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 777,781 ---- #define getinvalrectGlueParamSize (sizeof (h) + sizeof (r)) ! struct getinvalrectGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 793,797 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 796,800 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 804,808 **** #define geteditrectGlueParamSize (sizeof (h) + sizeof (r)) ! struct geteditrectGlueGluePB { unsigned char componentFlags; unsigned char componentParamSize; --- 807,811 ---- #define geteditrectGlueParamSize (sizeof (h) + sizeof (r)) ! struct geteditrectGlueGluePB { /* extension of ComponentParameters system type */ unsigned char componentFlags; unsigned char componentParamSize; *************** *** 823,827 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 826,830 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters*) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 934,937 **** --- 937,942 ---- /*setattributesGlue*/ + + #ifndef iowaRuntime static pascal ComponentResult geticonGlue (ComponentInstance comp, Handle *h) *************** *** 939,942 **** --- 944,949 ---- ComponentCallNow (IOAgeticoncommand, sizeof (Handle *)); /*geticonGlue*/ + + #endif |
