Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source uisharing.c,1.2,1.3
|
From: Andre R. <and...@us...> - 2004-10-26 10:27:49
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2496/Frontier/Common/source Modified Files: uisharing.c Log Message: Enable editGlue etc. functions for Mach-O to fix linker errors. Index: uisharing.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uisharing.c 23 Oct 2004 23:06:04 -0000 1.2 --- uisharing.c 26 Oct 2004 10:27:39 -0000 1.3 *************** *** 75,79 **** ! #if __powerc enum { --- 75,82 ---- ! /* 2004-10-22 aradke: Not sure if this is the right thing to do for the Mach-O build, ! but at least it makes the link errors for _editGlue etc. go away ! */ ! #if TARGET_RT_MAC_CFM || TARGET_RT_MAC_MACHO enum { *************** *** 85,95 **** extern UniversalProcPtr CallComponentUPP; glue windoweventGlue (ComponentInstance comp, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) { #define windoweventParamSize (sizeof (ev) + sizeof (wsGlobals)) - #ifdef powerc - #pragma options align=mac68k - #endif struct windoweventGluePB { unsigned char componentFlags; --- 88,97 ---- extern UniversalProcPtr CallComponentUPP; + #pragma options align=mac68k + glue windoweventGlue (ComponentInstance comp, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) { #define windoweventParamSize (sizeof (ev) + sizeof (wsGlobals)) struct windoweventGluePB { unsigned char componentFlags; *************** *** 100,106 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct windoweventGluePB pb; --- 102,105 ---- *************** *** 125,131 **** #define windowiscardParamSize (sizeof (w)) - #ifdef powerc - #pragma options align=mac68k - #endif struct windowiscardGluePB { unsigned char componentFlags; --- 124,127 ---- *************** *** 135,141 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct windowiscardGluePB pb; --- 131,134 ---- *************** *** 159,165 **** #define closewindowParamSize (sizeof (w)) - #ifdef powerc - #pragma options align=mac68k - #endif struct closewindowGluePB { unsigned char componentFlags; --- 152,155 ---- *************** *** 169,175 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct closewindowGluePB pb; --- 159,162 ---- *************** *** 195,201 **** #define initsharedmenusParamSize (0L) - #ifdef powerc - #pragma options align=mac68k - #endif struct initsharedmenusGluePB { unsigned char componentFlags; --- 182,185 ---- *************** *** 204,210 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct initsharedmenusGluePB pb; --- 188,191 ---- *************** *** 227,233 **** #define sharedmenuhitParamSize (sizeof (idmenu) + sizeof (iditem) + sizeof (flshareditem)) - #ifdef powerc - #pragma options align=mac68k - #endif struct sharedmenuhitGluePB { unsigned char componentFlags; --- 208,211 ---- *************** *** 239,245 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct sharedmenuhitGluePB pb; --- 217,220 ---- *************** *** 265,271 **** #define sharedscriptrunningParamSize (sizeof (flrunning)) - #ifdef powerc - #pragma options align=mac68k - #endif struct sharedscriptrunningGluePB { unsigned char componentFlags; --- 240,243 ---- *************** *** 275,281 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct sharedscriptrunningGluePB pb; --- 247,250 ---- *************** *** 299,305 **** #define cancelsharedscriptParamSize (0L) - #ifdef powerc - #pragma options align=mac68k - #endif struct cancelsharedscriptGluePB { unsigned char componentFlags; --- 268,271 ---- *************** *** 308,314 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct cancelsharedscriptGluePB pb; --- 274,277 ---- *************** *** 331,337 **** #define checksharedmenusParamSize (sizeof (idinsertafter)) - #ifdef powerc - #pragma options align=mac68k - #endif struct checksharedmenusGluePB { unsigned char componentFlags; --- 294,297 ---- *************** *** 341,347 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct checksharedmenusGluePB pb; --- 301,304 ---- *************** *** 365,371 **** #define disposesharedmenusParamSize (0L) - #ifdef powerc - #pragma options align=mac68k - #endif struct disposesharedmenusGluePB { unsigned char componentFlags; --- 322,325 ---- *************** *** 374,380 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct disposesharedmenusGluePB pb; --- 328,331 ---- *************** *** 397,403 **** #define issharedmenuParamSize (sizeof (idmenu) + sizeof (flsharedmenu)) - #ifdef powerc - #pragma options align=mac68k - #endif struct issharedmenuGluePB { unsigned char componentFlags; --- 348,351 ---- *************** *** 408,414 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct issharedmenuGluePB pb; --- 356,359 ---- *************** *** 433,439 **** #define enablesharedmenusParamSize (sizeof (flenable)) - #ifdef powerc - #pragma options align=mac68k - #endif struct enablesharedmenusGluePB { unsigned char componentFlags; --- 378,381 ---- *************** *** 443,449 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct enablesharedmenusGluePB pb; --- 385,388 ---- *************** *** 467,473 **** #define runsharedmenuitemParamSize (sizeof (idmenu) + sizeof (iditem)) - #ifdef powerc - #pragma options align=mac68k - #endif struct runsharedmenuitemGluePB { unsigned char componentFlags; --- 406,409 ---- *************** *** 478,484 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct runsharedmenuitemGluePB pb; --- 414,417 ---- *************** *** 503,509 **** #define setscripterrorcallbackParamSize (sizeof (scripterrorproc)) - #ifdef powerc - #pragma options align=mac68k - #endif struct setscripterrorcallbackGluePB { unsigned char componentFlags; --- 436,439 ---- *************** *** 513,519 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct setscripterrorcallbackGluePB pb; --- 443,446 ---- *************** *** 537,543 **** #define stubstartParamSize (0L) - #ifdef powerc - #pragma options align=mac68k - #endif struct stubstartGluePB { unsigned char componentFlags; --- 464,467 ---- *************** *** 546,552 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct stubstartGluePB pb; --- 470,473 ---- *************** *** 571,577 **** #define runhandleParamSize (sizeof (h) + sizeof (flscriptedcard) + sizeof (windowname) + sizeof (pt) + sizeof (filter)) - #ifdef powerc - #pragma options align=mac68k - #endif struct runhandleGluePB { unsigned char componentFlags; --- 492,495 ---- *************** *** 585,591 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct runhandleGluePB pb; --- 503,506 ---- *************** *** 613,619 **** #define runmodalhandleParamSize (sizeof (h) + sizeof (flscriptedcard) + sizeof (windowname) + sizeof (pt) + sizeof (filter)) - #ifdef powerc - #pragma options align=mac68k - #endif struct runmodalhandleGluePB { unsigned char componentFlags; --- 528,531 ---- *************** *** 627,633 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct runmodalhandleGluePB pb; --- 539,542 ---- *************** *** 655,661 **** #define setobjectvalueParamSize (sizeof (hcard) + sizeof (name) + sizeof (value)) - #ifdef powerc - #pragma options align=mac68k - #endif struct setobjectvalueGluePB { unsigned char componentFlags; --- 564,567 ---- *************** *** 667,673 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct setobjectvalueGluePB pb; --- 573,576 ---- *************** *** 693,699 **** #define getobjectvalueParamSize (sizeof (hcard) + sizeof (name) + sizeof (value)) - #ifdef powerc - #pragma options align=mac68k - #endif struct getobjectvalueGluePB { unsigned char componentFlags; --- 596,599 ---- *************** *** 705,711 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct getobjectvalueGluePB pb; --- 605,608 ---- *************** *** 731,737 **** #define getobjecthandleParamSize (sizeof (hcard) + sizeof (name) + sizeof (h)) - #ifdef powerc - #pragma options align=mac68k - #endif struct getobjecthandleGluePB { unsigned char componentFlags; --- 628,631 ---- *************** *** 743,749 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct getobjecthandleGluePB pb; --- 637,640 ---- *************** *** 769,775 **** #define recalcParamSize (sizeof (h)) - #ifdef powerc - #pragma options align=mac68k - #endif struct recalcGluePB { unsigned char componentFlags; --- 660,663 ---- *************** *** 779,785 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct recalcGluePB pb; --- 667,670 ---- *************** *** 803,809 **** #define editParamSize (sizeof (editcommand)) - #ifdef powerc - #pragma options align=mac68k - #endif struct editGluePB { unsigned char componentFlags; --- 688,691 ---- *************** *** 813,819 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct editGluePB pb; --- 695,698 ---- *************** *** 837,843 **** #define updateParamSize (sizeof (h)) - #ifdef powerc - #pragma options align=mac68k - #endif struct updateGluePB { unsigned char componentFlags; --- 716,719 ---- *************** *** 847,853 **** ComponentInstance comp; }; - #ifdef powerc - #pragma options align=reset - #endif struct updateGluePB pb; --- 723,726 ---- *************** *** 866,869 **** --- 739,744 ---- } /*updateGlue*/ + #pragma options align=reset + #elif 0 // defined (THINK_C) |
