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

[Andre R. <and...@us...>]

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

Modified Files:
	osacomponent.c 
Log Message:
Sanitized global includes. Include frontier.h in all source files. Move inclusion of system header files into osincludes.h.

Index: osacomponent.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osacomponent.c	9 Oct 2004 07:54:40 -0000	1.1
--- osacomponent.c	23 Oct 2004 22:46:24 -0000	1.2
***************
*** 24,27 ****
--- 24,30 ----
  ******************************************************************************/
  
+ #include "frontier.h"
+ #include "standard.h"
+ 
  /*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.*/
***************
*** 32,51 ****
  /*copyright 1992-1993, UserLand Software, Inc.*/
  
- #include <AppleEvents.h>
- #include <AERegistry.h>
- #include <AEPackObject.h>
- #include <AEObjects.h>
- #include <AppleScript.h>
- 
  //#pragma options (pack_enums) /* 2002-10-13 AR: pragma not supported by CodeWarrior */
  
- #include <Components.h>
- #include <Gestalt.h>
- #include <OSA.h>
- #include <OSAComp.h>
- #include <Traps.h>
- #include <ctype.h>
  #include <land.h>
- #include <standard.h>
  #include <UserTalk.h>
  #include "dialogs.h"
--- 35,41 ----
***************
*** 752,769 ****
  
  
- 
- // Subroutine Events:
- 
- enum {
- 	kASSubroutineEvent			= 'psbr',
- 	keyASSubroutineName			= 'snam'
- };
- 
- enum {
- 	kASAppleScriptSuite			= 'ascr',
- 	kASCommentEvent				= 'cmnt'
- };
- 
- 
  typedef struct tyservercomponent {
  	
--- 742,745 ----
***************
*** 907,911 ****
  	#endif
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	DisposeOSAActiveUPP((**hcg).activeproc);
  	DisposeOSASendUPP((**hcg).sendproc);
--- 883,887 ----
  	#endif
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeOSAActiveUPP((**hcg).activeproc);
  	DisposeOSASendUPP((**hcg).sendproc);
***************
*** 1135,1139 ****
  	(**hcg).storagetable = storagetable;
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	(**hcg).activeproc = NewOSAActiveUPP(osadefaultactiveproc);
  	
--- 1111,1115 ----
  	(**hcg).storagetable = storagetable;
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	(**hcg).activeproc = NewOSAActiveUPP(osadefaultactiveproc);
  	
***************
*** 1583,1587 ****
  	if (++osacoercionhandlerinstalled == 1)
  	{
! 		#if TARGET_API_MAC_CARBON == 1
  		if(coerceTEXTtoSTXTUPP == nil)
  			coerceTEXTtoSTXTUPP = NewAECoerceDescUPP(coerceTEXTtoSTXT);
--- 1559,1563 ----
  	if (++osacoercionhandlerinstalled == 1)
  	{
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if(coerceTEXTtoSTXTUPP == nil)
  			coerceTEXTtoSTXTUPP = NewAECoerceDescUPP(coerceTEXTtoSTXT);
***************
*** 1635,1639 ****
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:02:21 PM
  		//added dispose of coercion handler
! 		#if TARGET_API_MAC_CARBON == 1
  		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  && TARGET_RT_MAC_CFM
  		if(coerceTEXTtoSTXTUPP != nil)
  		{
***************
*** 1746,1750 ****
--- 1722,1730 ----
  	else {
  	
+ 		#if !TARGET_API_MAC_CARBON
  		origtrap = installpatch (_GetNextEvent, osagetnexteventUPP);
+ 		#else
+ 		origtrap = nil;
+ 		#endif
  		
  		origproc = (**hcg).getnexteventproc;
***************
*** 1767,1772 ****
  		assert ((**hcg).getnexteventproc != nil);
  		
  		removepatch (_GetNextEvent, (**hcg).getnexteventproc);
! 		
  		(**hcg).getnexteventproc = origproc;
  		}
--- 1747,1754 ----
  		assert ((**hcg).getnexteventproc != nil);
  		
+ 		#if !TARGET_API_MAC_CARBON
  		removepatch (_GetNextEvent, (**hcg).getnexteventproc);
! 		#endif
! 				
  		(**hcg).getnexteventproc = origproc;
  		}
***************
*** 3977,3981 ****
  	osapushfastcontext (hcg);
  	
! 	#if TARGET_API_MAC_CARBON == 1	
  	coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT);
  	AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false);
--- 3959,3963 ----
  	osapushfastcontext (hcg);
  	
! 	#if TARGET_API_MAC_CARBON  && TARGET_RT_MAC_CFM	
  	coerceInsltoTEXTDesc = NewAECoerceDescUPP(coerceInsltoTEXT);
  	AEInstallCoercionHandler (typeInsertionLoc, typeObjectSpecifier, coerceInsltoTEXTDesc, 0, true, false);
***************
*** 4216,4220 ****
  	//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 == 1
  	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 && TARGET_RT_MAC_CFM
  	AERemoveCoercionHandler (typeInsertionLoc, typeChar, coerceInsltoTEXTDesc, false);
  	DisposeAECoerceDescUPP(coerceInsltoTEXTDesc);
***************
*** 4297,4301 ****
  		//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 == 1
  		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 && TARGET_RT_MAC_CFM
  		if (handlerecordableeventDesc == nil)
  			handlerecordableeventDesc = NewAEEventHandlerUPP(handlerecordableevent);
***************
*** 4357,4361 ****
  	//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 == 1
  	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 && TARGET_RT_MAC_CFM
  	DisposeAEEventHandlerUPP(handlerecordableeventDesc);
  	handlerecordableeventDesc = nil;
***************
*** 5135,5139 ****
  			
  			case kComponentCloseSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunctionWithStorage (storage, params, (**theGlobals).cmpcloseUPP);								
  				#else
--- 5117,5121 ----
  			
  			case kComponentCloseSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunctionWithStorage (storage, params, (**theGlobals).cmpcloseUPP);								
  				#else
***************
*** 5143,5147 ****
  			
  			case kComponentCanDoSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunction (params, (**theGlobals).cmpcandoUPP);			
  				#else
--- 5125,5129 ----
  			
  			case kComponentCanDoSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunction (params, (**theGlobals).cmpcandoUPP);			
  				#else
***************
*** 5151,5155 ****
  			
  			case kComponentVersionSelect:
! 				#if TARGET_API_MAC_CARBON
  				result = CallComponentFunction(params, (**theGlobals).cmpversionUPP);			
  				#else
--- 5133,5137 ----
  			
  			case kComponentVersionSelect:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				result = CallComponentFunction(params, (**theGlobals).cmpversionUPP);			
  				#else
***************
*** 5170,5174 ****
  			
  			case kOSASelectLoad:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaLoadUPP;
  				#else
--- 5152,5156 ----
  			
  			case kOSASelectLoad:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaLoadUPP;
  				#else
***************
*** 5178,5182 ****
  			
  			case kOSASelectStore:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStoreUPP;
  				#else
--- 5160,5164 ----
  			
  			case kOSASelectStore:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStoreUPP;
  				#else
***************
*** 5186,5190 ****
  			
  			case kOSASelectExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaExecuteUPP;
  				#else
--- 5168,5172 ----
  			
  			case kOSASelectExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaExecuteUPP;
  				#else
***************
*** 5194,5198 ****
  			
  			case kOSASelectDisplay:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDisplayUPP;
  				#else
--- 5176,5180 ----
  			
  			case kOSASelectDisplay:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDisplayUPP;
  				#else
***************
*** 5202,5206 ****
  			
  			case kOSASelectScriptError:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaScriptErrorUPP;
  				#else
--- 5184,5188 ----
  			
  			case kOSASelectScriptError:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaScriptErrorUPP;
  				#else
***************
*** 5210,5214 ****
  			
  			case kOSASelectDispose:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDisposeUPP;
  				#else
--- 5192,5196 ----
  			
  			case kOSASelectDispose:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDisposeUPP;
  				#else
***************
*** 5218,5222 ****
  			
  			case kOSASelectSetScriptInfo:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetScriptInfoUPP;
  				#else
--- 5200,5204 ----
  			
  			case kOSASelectSetScriptInfo:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetScriptInfoUPP;
  				#else
***************
*** 5226,5230 ****
  			
  			case kOSASelectGetScriptInfo:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetScriptInfoUPP;
  				#else
--- 5208,5212 ----
  			
  			case kOSASelectGetScriptInfo:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetScriptInfoUPP;
  				#else
***************
*** 5234,5238 ****
  			
  			case kOSASelectCompile:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCompileUPP;
  				#else
--- 5216,5220 ----
  			
  			case kOSASelectCompile:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCompileUPP;
  				#else
***************
*** 5242,5246 ****
  			
  			case kOSASelectGetSource:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetSourceUPP;
  				#else
--- 5224,5228 ----
  			
  			case kOSASelectGetSource:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetSourceUPP;
  				#else
***************
*** 5250,5254 ****
  			
  			case kOSASelectCoerceFromDesc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCoerceFromDescUPP;
  				#else
--- 5232,5236 ----
  			
  			case kOSASelectCoerceFromDesc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCoerceFromDescUPP;
  				#else
***************
*** 5258,5262 ****
  			
  			case kOSASelectCoerceToDesc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCoerceToDescUPP;
  				#else
--- 5240,5244 ----
  			
  			case kOSASelectCoerceToDesc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCoerceToDescUPP;
  				#else
***************
*** 5266,5270 ****
  			
  			case kOSASelectStartRecording:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStartRecordingUPP;
  				#else
--- 5248,5252 ----
  			
  			case kOSASelectStartRecording:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStartRecordingUPP;
  				#else
***************
*** 5274,5278 ****
  			
  			case kOSASelectStopRecording:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaStopRecordingUPP;
  				#else
--- 5256,5260 ----
  			
  			case kOSASelectStopRecording:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaStopRecordingUPP;
  				#else
***************
*** 5282,5286 ****
  			
  			case kOSASelectScriptingComponentName:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaScriptingComponentNameUPP;
  				#else
--- 5264,5268 ----
  			
  			case kOSASelectScriptingComponentName:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaScriptingComponentNameUPP;
  				#else
***************
*** 5290,5294 ****
  			
  			case kOSASelectLoadExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaLoadExecuteUPP;
  				#else
--- 5272,5276 ----
  			
  			case kOSASelectLoadExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaLoadExecuteUPP;
  				#else
***************
*** 5298,5302 ****
  			
  			case kOSASelectCompileExecute:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaCompileExecuteUPP;
  				#else
--- 5280,5284 ----
  			
  			case kOSASelectCompileExecute:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaCompileExecuteUPP;
  				#else
***************
*** 5306,5310 ****
  			
  			case kOSASelectDoScript:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDoScriptUPP;
  				#else
--- 5288,5292 ----
  			
  			case kOSASelectDoScript:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDoScriptUPP;
  				#else
***************
*** 5314,5318 ****
  			
  			case kOSASelectMakeContext:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaMakeContextUPP;
  				#else
--- 5296,5300 ----
  			
  			case kOSASelectMakeContext:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaMakeContextUPP;
  				#else
***************
*** 5322,5326 ****
  			
  			case kOSASelectSetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetResumeDispatchProcUPP;
  				#else
--- 5304,5308 ----
  			
  			case kOSASelectSetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetResumeDispatchProcUPP;
  				#else
***************
*** 5330,5334 ****
  			
  			case kOSASelectGetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetResumeDispatchProcUPP;
  				#else
--- 5312,5316 ----
  			
  			case kOSASelectGetResumeDispatchProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetResumeDispatchProcUPP;
  				#else
***************
*** 5338,5342 ****
  			
  			case kOSASelectExecuteEvent:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaExecuteEventUPP;
  				#else
--- 5320,5324 ----
  			
  			case kOSASelectExecuteEvent:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaExecuteEventUPP;
  				#else
***************
*** 5346,5350 ****
  			
  			case kOSASelectDoEvent:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDoEventUPP;
  				#else
--- 5328,5332 ----
  			
  			case kOSASelectDoEvent:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDoEventUPP;
  				#else
***************
*** 5354,5358 ****
  			
  			case kOSASelectSetActiveProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetActiveProcUPP;
  				#else
--- 5336,5340 ----
  			
  			case kOSASelectSetActiveProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetActiveProcUPP;
  				#else
***************
*** 5362,5366 ****
  			
  			case kOSASelectSetDebugProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetDebugProcUPP;
  				#else
--- 5344,5348 ----
  			
  			case kOSASelectSetDebugProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetDebugProcUPP;
  				#else
***************
*** 5370,5374 ****
  			
  			case kOSASelectDebug:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaDebugUPP;
  				#else
--- 5352,5356 ----
  			
  			case kOSASelectDebug:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaDebugUPP;
  				#else
***************
*** 5378,5382 ****
  			
  			case kOSASelectSetSendProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetSendProcUPP;
  				#else
--- 5360,5364 ----
  			
  			case kOSASelectSetSendProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetSendProcUPP;
  				#else
***************
*** 5386,5390 ****
  			
  			case kOSASelectGetSendProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetSendProcUPP;
  				#else
--- 5368,5372 ----
  			
  			case kOSASelectGetSendProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetSendProcUPP;
  				#else
***************
*** 5394,5398 ****
  			
  			case kOSASelectSetCreateProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetCreateProcUPP;
  				#else
--- 5376,5380 ----
  			
  			case kOSASelectSetCreateProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetCreateProcUPP;
  				#else
***************
*** 5402,5406 ****
  			
  			case kOSASelectGetCreateProc:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaGetCreateProcUPP;
  				#else
--- 5384,5388 ----
  			
  			case kOSASelectGetCreateProc:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaGetCreateProcUPP;
  				#else
***************
*** 5412,5416 ****
  			
  			case kOSASelectSetDefaultTarget:
! 				#if TARGET_API_MAC_CARBON
  				func = (**theGlobals).osaSetDefaultTargetUPP;
  				#else
--- 5394,5398 ----
  			
  			case kOSASelectSetDefaultTarget:
! 				#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  				func = (**theGlobals).osaSetDefaultTargetUPP;
  				#else
***************
*** 6191,6195 ****
  		//Code change by Timothy Paustian Friday, July 21, 2000 11:18:39 PM
  	//create all the osa UPPs
! 	#if TARGET_API_MAC_CARBON == 1
  	
  	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 && TARGET_RT_MAC_CFM
  	
  	osaclientactiveDesc = NewOSAActiveUPP(osaclientactive);
***************
*** 6478,6482 ****
  	
  	AERemoveCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, true);
! 	#if TARGET_API_MAC_CARBON == 1
  	DisposeAECoerceDescUPP(coerceTypetoObjDesc);
  	
--- 6460,6464 ----
  	
  	AERemoveCoercionHandler (typeType, typeObjectSpecifier, coerceTypetoObjUPP, true);
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeAECoerceDescUPP(coerceTypetoObjDesc);
  	
***************
*** 6533,6537 ****
  	RegisterComponentResourceFile (filegetapplicationrnum (), true); /*2.1b4*/
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	coerceTypetoObjDesc = NewAECoerceDescUPP(coerceTypetoObj);
  	#endif
--- 6515,6519 ----
  	RegisterComponentResourceFile (filegetapplicationrnum (), true); /*2.1b4*/
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	coerceTypetoObjDesc = NewAECoerceDescUPP(coerceTypetoObj);
  	#endif
***************
*** 6551,6570 ****
  /*copyright 1992-1993, UserLand Software, Inc.*/
  
- #include <AppleEvents.h>
- #include <AERegistry.h>
- #include <AEPackObject.h>
- #include <AEObjects.h>
- #include <AppleScript.h>
- 
  //#pragma options (pack_enums) /* 2002-10-13 AR: pragma not supported by CodeWarrior */
  
- #include <Components.h>
- #include <Gestalt.h>
- #include <OSA.h>
- #include <OSAComp.h>
- #include <Traps.h>
- #include <ctype.h>
  #include <land.h>
- #include <standard.h>
  #include <UserTalk.h>
  #include "dialogs.h"
--- 6533,6539 ----
***************
*** 6606,6623 ****
  
  
- 
- // Subroutine Events:
- 
- enum {
- 	kASSubroutineEvent			= 'psbr',
- 	keyASSubroutineName			= 'snam'
- };
- 
- enum {
- 	kASAppleScriptSuite			= 'ascr',
- 	kASCommentEvent				= 'cmnt'
- };
- 
- 
  typedef struct tyservercomponent {
  	
--- 6575,6578 ----
***************
*** 7417,7429 ****
  
  
  static UniversalProcPtr installpatch (short trapnum, GNEUPP patch) {
  	
  	UniversalProcPtr origtrap;
  	
- 	#if !TARGET_API_MAC_CARBON
  	origtrap = NGetTrapAddress (trapnum, ToolTrap);
  	
  	NSetTrapAddress ((UniversalProcPtr) patch, trapnum, ToolTrap);
- 	#endif
  
  	return (origtrap);
--- 7372,7384 ----
  
  
+ #if !TARGET_API_MAC_CARBON
+ 
  static UniversalProcPtr installpatch (short trapnum, GNEUPP patch) {
  	
  	UniversalProcPtr origtrap;
  	
  	origtrap = NGetTrapAddress (trapnum, ToolTrap);
  	
  	NSetTrapAddress ((UniversalProcPtr) patch, trapnum, ToolTrap);
  
  	return (origtrap);
***************
*** 7433,7442 ****
  static void removepatch (short trapnum, GNEUPP origtrap) {
  	
- 	#if !TARGET_API_MAC_CARBON
  	NSetTrapAddress ((UniversalProcPtr) origtrap, trapnum, ToolTrap);
- 	#endif
  
  	} /*removepatch*/
  
  
  static pascal Boolean osagetnextevent (short, EventRecord *);
--- 7388,7397 ----
  static void removepatch (short trapnum, GNEUPP origtrap) {
  	
  	NSetTrapAddress ((UniversalProcPtr) origtrap, trapnum, ToolTrap);
  
  	} /*removepatch*/
  
+ #endif /*!TARGET_API_MAC_CARBON*/
+ 
  
  static pascal Boolean osagetnextevent (short, EventRecord *);