[frontierkernel-commits] Frontier/Common/source osacomponent.c,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21079/Frontier/Common/source

Modified Files:
	osacomponent.c 
Log Message:
Use the same code for the Carbon/CFM and Carbon/Mach-O version to deal with Universal Procedure Pointers (UPPs) for OSA callback functions.

Index: osacomponent.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osacomponent.c	23 Oct 2004 22:46:24 -0000	1.2
--- osacomponent.c	26 Oct 2004 22:33:35 -0000	1.3
***************
*** 218,222 ****
  			long*						refCon);

! #if !TARGET_RT_MAC_CFM

  	#define cmpcloseUPP	((ComponentFunctionUPP) cmpclose)
--- 218,222 ----
  			long*						refCon);

! #if 0 //!TARGET_RT_MAC_CFM

  	#define cmpcloseUPP	((ComponentFunctionUPP) cmpclose)
***************
*** 694,698 ****
  #endif

! #if !TARGET_RT_MAC_CFM

  	#define osaclientactiveUPP (&osaclientactive)
--- 694,698 ----
  #endif

! #if 0//!TARGET_RT_MAC_CFM

  	#define osaclientactiveUPP (&osaclientactive)
***************
*** 883,887 ****
  	#endif

! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeOSAActiveUPP((**hcg).activeproc);
  	DisposeOSASendUPP((**hcg).sendproc);
--- 883,887 ----
  	#endif

! 	#if TARGET_API_MAC_CARBON
  	DisposeOSAActiveUPP((**hcg).activeproc);
  	DisposeOSASendUPP((**hcg).sendproc);
***************
*** 983,987 ****
  //Code change by Timothy Paustian Friday, July 21, 2000 10:52:57 PM
  //I think I can get away with this because only frontier code calls it.
! #if !TARGET_RT_MAC_CFM

  	#define osadefaultactiveUPP ((OSAActiveProcPtr) &osadefaultactiveproc)
--- 983,987 ----
  //Code change by Timothy Paustian Friday, July 21, 2000 10:52:57 PM
  //I think I can get away with this because only frontier code calls it.
! #if 0//!TARGET_RT_MAC_CFM

  	#define osadefaultactiveUPP ((OSAActiveProcPtr) &osadefaultactiveproc)
***************
*** 1111,1115 ****
  	(**hcg).storagetable = storagetable;

! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	(**hcg).activeproc = NewOSAActiveUPP(osadefaultactiveproc);

--- 1111,1115 ----
  	(**hcg).storagetable = storagetable;

! 	#if TARGET_API_MAC_CARBON
  	(**hcg).activeproc = NewOSAActiveUPP(osadefaultactiveproc);

***************
*** 1478,1482 ****
  //Code change by Timothy Paustian Friday, June 16, 2000 1:38:13 PM
  //Changed to Opaque call for Carbon
! #if !TARGET_RT_MAC_CFM

  	#define coerceTEXTtoSTXTUPP ((AECoercionHandlerUPP) &coerceTEXTtoSTXT)
--- 1478,1482 ----
  //Code change by Timothy Paustian Friday, June 16, 2000 1:38:13 PM
  //Changed to Opaque call for Carbon
! #if 0//!TARGET_RT_MAC_CFM

  	#define coerceTEXTtoSTXTUPP ((AECoercionHandlerUPP) &coerceTEXTtoSTXT)
***************
*** 1559,1563 ****
  	if (++osacoercionhandlerinstalled == 1)
  	{
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if(coerceTEXTtoSTXTUPP == nil)
  			coerceTEXTtoSTXTUPP = NewAECoerceDescUPP(coerceTEXTtoSTXT);
--- 1559,1563 ----
  	if (++osacoercionhandlerinstalled == 1)
  	{
! 		#if TARGET_API_MAC_CARBON
  		if(coerceTEXTtoSTXTUPP == nil)
  			coerceTEXTtoSTXTUPP = NewAECoerceDescUPP(coerceTEXTtoSTXT);
***************
*** 1611,1615 ****
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:02:21 PM
  		//added dispose of coercion handler
! 		#if TARGET_API_MAC_CARBON  && TARGET_RT_MAC_CFM
  		if(coerceTEXTtoSTXTUPP != nil)
  		{
--- 1611,1615 ----
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:02:21 PM
  		//added dispose of coercion handler
! 		#if TARGET_API_MAC_CARBON
  		if(coerceTEXTtoSTXTUPP != nil)
  		{
***************
*** 3643,3647 ****

! #if !TARGET_RT_MAC_CFM

  	#define coerceInsltoTEXTUPP ((AECoercionHandlerUPP) &coerceInsltoTEXT)
--- 3643,3647 ----

! #if 0//!TARGET_RT_MAC_CFM

  	#define coerceInsltoTEXTUPP ((AECoercionHandlerUPP) &coerceInsltoTEXT)
***************
*** 3959,3963 ****
  	osapushfastcontext (hcg);

! 	#if TARGET_API_MAC_CARBON  && TARGET_RT_MAC_CFM	
  	coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT);
  	AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false);
--- 3959,3963 ----
  	osapushfastcontext (hcg);

! 	#if TARGET_API_MAC_CARBON	
  	coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT);
  	AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false);
***************
*** 4198,4202 ****
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:03:49 PM
  	//Get rid of the UPP wer are done.
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	AERemoveCoercionHandler (typeInsertionLoc, typeChar, coerceInsltoTEXTDesc, false);
  	DisposeAECoerceDescUPP(coerceInsltoTEXTDesc);
--- 4198,4202 ----
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:03:49 PM
  	//Get rid of the UPP wer are done.
! 	#if TARGET_API_MAC_CARBON
  	AERemoveCoercionHandler (typeInsertionLoc, typeChar, coerceInsltoTEXTDesc, false);
  	DisposeAECoerceDescUPP(coerceInsltoTEXTDesc);
***************
*** 4214,4218 ****
  //Code change by Timothy Paustian Monday, June 26, 2000 9:37:56 PM
  //
! #if !TARGET_RT_MAC_CFM
  	#define handlerecordableeventUPP handlerecordableevent

--- 4214,4218 ----
  //Code change by Timothy Paustian Monday, June 26, 2000 9:37:56 PM
  //
! #if 0//!TARGET_RT_MAC_CFM
  	#define handlerecordableeventUPP handlerecordableevent

***************
*** 4279,4283 ****
  		//Code change by Timothy Paustian Friday, July 28, 2000 2:40:45 PM
  		//we need to create the UPP now that we want to use it.
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if (handlerecordableeventDesc == nil)
  			handlerecordableeventDesc = NewAEEventHandlerUPP(handlerecordableevent);
--- 4279,4283 ----
  		//Code change by Timothy Paustian Friday, July 28, 2000 2:40:45 PM
  		//we need to create the UPP now that we want to use it.
! 		#if TARGET_API_MAC_CARBON
  		if (handlerecordableeventDesc == nil)
  			handlerecordableeventDesc = NewAEEventHandlerUPP(handlerecordableevent);
***************
*** 4339,4343 ****
  	//Code change by Timothy Paustian Friday, July 28, 2000 2:43:14 PM
  	//I am assuming the osaStopRecording is called every time osaStartRecording is called.
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeAEEventHandlerUPP(handlerecordableeventDesc);
  	handlerecordableeventDesc = nil;
--- 4339,4343 ----
  	//Code change by Timothy Paustian Friday, July 28, 2000 2:43:14 PM
  	//I am assuming the osaStopRecording is called every time osaStartRecording is called.
! 	#if TARGET_API_MAC_CARBON
  	DisposeAEEventHandlerUPP(handlerecordableeventDesc);
  	handlerecordableeventDesc = nil;
***************
*** 5117,5121 ****

  			case kComponentCloseSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunctionWithStorage (storage, params, (**theGlobals).cmpcloseUPP);								
  				#else
--- 5117,5121 ----

  			case kComponentCloseSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunctionWithStorage (storage, params, (**theGlobals).cmpcloseUPP);								
  				#else
***************
*** 5125,5129 ****

  			case kComponentCanDoSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunction (params, (**theGlobals).cmpcandoUPP);			
  				#else
--- 5125,5129 ----

  			case kComponentCanDoSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunction (params, (**theGlobals).cmpcandoUPP);			
  				#else
***************
*** 5133,5137 ****

  			case kComponentVersionSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunction(params, (**theGlobals).cmpversionUPP);			
  				#else
--- 5133,5137 ----

  			case kComponentVersionSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunction(params, (**theGlobals).cmpversionUPP);			
  				#else
***************
*** 5152,5156 ****

  			case kOSASelectLoad:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaLoadUPP;
  				#else
--- 5152,5156 ----

  			case kOSASelectLoad:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaLoadUPP;
  				#else
***************
*** 5160,5164 ****

  			case kOSASelectStore:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStoreUPP;
  				#else
--- 5160,5164 ----

  			case kOSASelectStore:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStoreUPP;
  				#else
***************
*** 5168,5172 ****

  			case kOSASelectExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaExecuteUPP;
  				#else
--- 5168,5172 ----

  			case kOSASelectExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaExecuteUPP;
  				#else
***************
*** 5176,5180 ****

  			case kOSASelectDisplay:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDisplayUPP;
  				#else
--- 5176,5180 ----

  			case kOSASelectDisplay:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDisplayUPP;
  				#else
***************
*** 5184,5188 ****

  			case kOSASelectScriptError:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaScriptErrorUPP;
  				#else
--- 5184,5188 ----

  			case kOSASelectScriptError:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaScriptErrorUPP;
  				#else
***************
*** 5192,5196 ****

  			case kOSASelectDispose:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDisposeUPP;
  				#else
--- 5192,5196 ----

  			case kOSASelectDispose:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDisposeUPP;
  				#else
***************
*** 5200,5204 ****

  			case kOSASelectSetScriptInfo:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetScriptInfoUPP;
  				#else
--- 5200,5204 ----

  			case kOSASelectSetScriptInfo:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetScriptInfoUPP;
  				#else
***************
*** 5208,5212 ****

  			case kOSASelectGetScriptInfo:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetScriptInfoUPP;
  				#else
--- 5208,5212 ----

  			case kOSASelectGetScriptInfo:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetScriptInfoUPP;
  				#else
***************
*** 5216,5220 ****

  			case kOSASelectCompile:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCompileUPP;
  				#else
--- 5216,5220 ----

  			case kOSASelectCompile:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCompileUPP;
  				#else
***************
*** 5224,5228 ****

  			case kOSASelectGetSource:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetSourceUPP;
  				#else
--- 5224,5228 ----

  			case kOSASelectGetSource:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetSourceUPP;
  				#else
***************
*** 5232,5236 ****

  			case kOSASelectCoerceFromDesc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCoerceFromDescUPP;
  				#else
--- 5232,5236 ----

  			case kOSASelectCoerceFromDesc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCoerceFromDescUPP;
  				#else
***************
*** 5240,5244 ****

  			case kOSASelectCoerceToDesc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCoerceToDescUPP;
  				#else
--- 5240,5244 ----

  			case kOSASelectCoerceToDesc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCoerceToDescUPP;
  				#else
***************
*** 5248,5252 ****

  			case kOSASelectStartRecording:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStartRecordingUPP;
  				#else
--- 5248,5252 ----

  			case kOSASelectStartRecording:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStartRecordingUPP;
  				#else
***************
*** 5256,5260 ****

  			case kOSASelectStopRecording:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStopRecordingUPP;
  				#else
--- 5256,5260 ----

  			case kOSASelectStopRecording:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStopRecordingUPP;
  				#else
***************
*** 5264,5268 ****

  			case kOSASelectScriptingComponentName:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaScriptingComponentNameUPP;
  				#else
--- 5264,5268 ----

  			case kOSASelectScriptingComponentName:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaScriptingComponentNameUPP;
  				#else
***************
*** 5272,5276 ****

  			case kOSASelectLoadExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaLoadExecuteUPP;
  				#else
--- 5272,5276 ----

  			case kOSASelectLoadExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaLoadExecuteUPP;
  				#else
***************
*** 5280,5284 ****

  			case kOSASelectCompileExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCompileExecuteUPP;
  				#else
--- 5280,5284 ----

  			case kOSASelectCompileExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCompileExecuteUPP;
  				#else
***************
*** 5288,5292 ****

  			case kOSASelectDoScript:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDoScriptUPP;
  				#else
--- 5288,5292 ----

  			case kOSASelectDoScript:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDoScriptUPP;
  				#else
***************
*** 5296,5300 ****

  			case kOSASelectMakeContext:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaMakeContextUPP;
  				#else
--- 5296,5300 ----

  			case kOSASelectMakeContext:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaMakeContextUPP;
  				#else
***************
*** 5304,5308 ****

  			case kOSASelectSetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetResumeDispatchProcUPP;
  				#else
--- 5304,5308 ----

  			case kOSASelectSetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetResumeDispatchProcUPP;
  				#else
***************
*** 5312,5316 ****

  			case kOSASelectGetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetResumeDispatchProcUPP;
  				#else
--- 5312,5316 ----

  			case kOSASelectGetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetResumeDispatchProcUPP;
  				#else
***************
*** 5320,5324 ****

  			case kOSASelectExecuteEvent:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaExecuteEventUPP;
  				#else
--- 5320,5324 ----

  			case kOSASelectExecuteEvent:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaExecuteEventUPP;
  				#else
***************
*** 5328,5332 ****

  			case kOSASelectDoEvent:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDoEventUPP;
  				#else
--- 5328,5332 ----

  			case kOSASelectDoEvent:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDoEventUPP;
  				#else
***************
*** 5336,5340 ****

  			case kOSASelectSetActiveProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetActiveProcUPP;
  				#else
--- 5336,5340 ----

  			case kOSASelectSetActiveProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetActiveProcUPP;
  				#else
***************
*** 5344,5348 ****

  			case kOSASelectSetDebugProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetDebugProcUPP;
  				#else
--- 5344,5348 ----

  			case kOSASelectSetDebugProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetDebugProcUPP;
  				#else
***************
*** 5352,5356 ****

  			case kOSASelectDebug:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDebugUPP;
  				#else
--- 5352,5356 ----

  			case kOSASelectDebug:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDebugUPP;
  				#else
***************
*** 5360,5364 ****

  			case kOSASelectSetSendProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetSendProcUPP;
  				#else
--- 5360,5364 ----

  			case kOSASelectSetSendProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetSendProcUPP;
  				#else
***************
*** 5368,5372 ****

  			case kOSASelectGetSendProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetSendProcUPP;
  				#else
--- 5368,5372 ----

  			case kOSASelectGetSendProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetSendProcUPP;
  				#else
***************
*** 5376,5380 ****

  			case kOSASelectSetCreateProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetCreateProcUPP;
  				#else
--- 5376,5380 ----

  			case kOSASelectSetCreateProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetCreateProcUPP;
  				#else
***************
*** 5384,5388 ****

  			case kOSASelectGetCreateProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetCreateProcUPP;
  				#else
--- 5384,5388 ----

  			case kOSASelectGetCreateProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetCreateProcUPP;
  				#else
***************
*** 5394,5398 ****

  			case kOSASelectSetDefaultTarget:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetDefaultTargetUPP;
  				#else
--- 5394,5398 ----

  			case kOSASelectSetDefaultTarget:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetDefaultTargetUPP;
  				#else
***************
*** 6173,6177 ****
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:18:39 PM
  	//create all the osa UPPs
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM

  	osaclientactiveDesc = NewOSAActiveUPP(osaclientactive);
--- 6173,6177 ----
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:18:39 PM
  	//create all the osa UPPs
! 	#if TARGET_API_MAC_CARBON

  	osaclientactiveDesc = NewOSAActiveUPP(osaclientactive);
***************
*** 6460,6464 ****

  	AERemoveCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, true);
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeAECoerceDescUPP(coerceTypetoObjDesc);

--- 6460,6464 ----

  	AERemoveCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, true);
! 	#if TARGET_API_MAC_CARBON
  	DisposeAECoerceDescUPP(coerceTypetoObjDesc);

***************
*** 6515,6519 ****
  	RegisterComponentResourceFile (filegetapplicationrnum (), true); /*2.1b4*/

! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	coerceTypetoObjDesc = NewAECoerceDescUPP(coerceTypetoObj);
  	#endif
--- 6515,6519 ----
  	RegisterComponentResourceFile (filegetapplicationrnum (), true); /*2.1b4*/

! 	#if TARGET_API_MAC_CARBON
  	coerceTypetoObjDesc = NewAECoerceDescUPP(coerceTypetoObj);
  	#endif