|
From: Andre R. <and...@us...> - 2004-10-28 12:19:36
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24102/Frontier/Common/source Modified Files: osacomponent.c Log Message: Major overhaul: Reconciled implementations for Carbon and Classic into a single implementation. Also eliminated some GCC compiler warnings. Index: osacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osacomponent.c 26 Oct 2004 22:33:35 -0000 1.3 --- osacomponent.c 28 Oct 2004 12:19:21 -0000 1.4 *************** *** 29,37 **** /*This file has been forked to protect the shipping version. The Carbon version is at the top, the "good" version at the bottom. This file should be reconciled later.*/ ! ! #if TARGET_API_MAC_CARBON == 1 ! ! ! /*copyright 1992-1993, UserLand Software, Inc.*/ //#pragma options (pack_enums) /* 2002-10-13 AR: pragma not supported by CodeWarrior */ --- 29,35 ---- [...9806 lines suppressed...] return (newclearhandle (longsizeof (tyclientlist), (Handle *) &hclientlist)); } /*osacomponentstart*/ - #endif - --- 6181,6193 ---- #if TARGET_API_MAC_CARBON ! coerceTypetoObjDesc = NewAECoerceDescUPP((AECoerceDescProcPtr)coerceTypetoObj); #endif ! AEInstallCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, 0, true, true); if (!initosaservers ()) return (false); return (newclearhandle (longsizeof (tyclientlist), (Handle *) &hclientlist)); } /*osacomponentstart*/ |