[frontierkernel-commits] Frontier/Common/UserLandIACToolkit landsystem7.c,1.1,1.2

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

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

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

Index: landsystem7.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem7.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** landsystem7.c	9 Oct 2004 06:15:09 -0000	1.1
--- landsystem7.c	23 Oct 2004 21:31:26 -0000	1.2
***************
*** 24,30 ****
  ******************************************************************************/
  
! #include <PPCToolBox.h>
! #include <Script.h>
! #include <Errors.h>
  #include "landinternal.h"
  
--- 24,30 ----
  ******************************************************************************/
  
! #include "frontier.h"
! #include "standard.h"
! 
  #include "landinternal.h"
  
***************
*** 192,195 ****
--- 192,197 ----
  
  
+ #if TARGET_API_MAC_OS8
+ 
  static OSErr HCProgramToPortAndLoc (char *theName, short len, LocationNameRec *theLoc, PortInfoRec *thePort) {
  	
***************
*** 298,312 ****
  	Call the damm routine and try to get the stupid port back!
  	*/
- 	//Code change by Timothy Paustian Monday, June 26, 2000 3:30:31 PM
- 	//Send back a bogus error. We cannot do this in Carbon.
- 	#if TARGET_API_MAC_CARBON == 1
- 	theErr = noResponseErr;
- 	#else
  	theErr = IPCListPortsSync (&thePBRec);
- 	#endif
  		
  	return (theErr);
  	} /*HCProgramToPortAndLoc*/
  
  
  static boolean isthisprocess (ProcessSerialNumber *targetPSN) {
--- 300,310 ----
  	Call the damm routine and try to get the stupid port back!
  	*/
  	theErr = IPCListPortsSync (&thePBRec);
  		
  	return (theErr);
  	} /*HCProgramToPortAndLoc*/
  
+ #endif
+ 
  
  static boolean isthisprocess (ProcessSerialNumber *targetPSN) {
***************
*** 358,361 ****
--- 356,361 ----
  
  
+ #if TARGET_API_MAC_OS8
+ 
  static boolean goodstring32 (byte s32 []) {
  	
***************
*** 421,424 ****
--- 421,439 ----
  	} /*landstring2networkaddress*/
  
+ #else
+ 
+ pascal boolean landstring2networkaddress (ConstStr255Param bsadr, tynetworkaddress *adr) {
+ 
+ 	/*
+ 	2004-10-21 aradke: Can't do this on Carbon, send back a bogus error.
+ 	*/
+ 	
+ 	landseterror (noResponseErr);
+ 	
+ 	return (false);
+ 	} /*landstring2networkaddress*/
+ 
+ #endif
+ 
  
  static pascal Boolean landbrowserfilter (LocationNamePtr ln, PortInfoPtr port) {
***************
*** 964,983 ****
  
  #if !TARGET_RT_MAC_CFM
- 
  	#define landsystem7handleeventUPP ((AEEventHandlerUPP) landsystem7handleevent)
- 
  #else
  	#if !TARGET_API_MAC_CARBON
! 
! 	static RoutineDescriptor landsystem7handleeventDesc = BUILD_ROUTINE_DESCRIPTOR (uppAEEventHandlerProcInfo, landsystem7handleevent);
! 
! 	#define landsystem7handleeventUPP (&landsystem7handleeventDesc)
! 
  	#else
! 	AEEventHandlerUPP	landsystem7handleeventDesc = nil;
! 	#define landsystem7handleeventUPP (landsystem7handleeventDesc)
  	#endif
- 
- 	
  #endif
  
--- 979,991 ----
  
  #if !TARGET_RT_MAC_CFM
  	#define landsystem7handleeventUPP ((AEEventHandlerUPP) landsystem7handleevent)
  #else
  	#if !TARGET_API_MAC_CARBON
! 		static RoutineDescriptor landsystem7handleeventDesc = BUILD_ROUTINE_DESCRIPTOR (uppAEEventHandlerProcInfo, landsystem7handleevent);
! 		#define landsystem7handleeventUPP (&landsystem7handleeventDesc)
  	#else
! 		AEEventHandlerUPP	landsystem7handleeventDesc = nil;
! 		#define landsystem7handleeventUPP (landsystem7handleeventDesc)
  	#endif
  #endif
  
***************
*** 1423,1427 ****
  	long id;
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	
  		landsystem7idleUPP = NewAEIdleUPP (&landsystem7idleroutine);
--- 1431,1435 ----
  	long id;
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	
  		landsystem7idleUPP = NewAEIdleUPP (&landsystem7idleroutine);
***************
*** 1784,1788 ****
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler if its still nil
! 		#if TARGET_API_MAC_CARBON ==1
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);
--- 1792,1796 ----
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler if its still nil
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);
***************
*** 1796,1800 ****
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler is its still nil
! 		#if TARGET_API_MAC_CARBON ==1
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);
--- 1804,1808 ----
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler is its still nil
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);
***************
*** 1809,1813 ****
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler is its still nil
! 		#if TARGET_API_MAC_CARBON ==1
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);
--- 1817,1821 ----
  		//Code change by Timothy Paustian Friday, July 28, 2000 1:31:13 PM
  		//create the new handler is its still nil
! 		#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  		if (landsystem7handleeventUPP == nil)
  			landsystem7handleeventUPP = NewAEEventHandlerUPP(landsystem7handleevent);