[frontierkernel-commits] Frontier/Common/source langstartup.c,1.4,1.5

[Terry T. <ter...@us...>]

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

Modified Files:
	langstartup.c 
Log Message:
Fixed a few things so the code can compile with CodeWarrior (both Mac OS and Windows).

Index: langstartup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langstartup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langstartup.c	24 Nov 2004 18:58:00 -0000	1.4
--- langstartup.c	25 Nov 2004 09:31:48 -0000	1.5
***************
*** 41,45 ****
--- 41,47 ----
  #include "resources.h"
  #include "WinSockNetEvents.h"
+ #if TARGET_API_MAC_CARBON == 1
  #include "CallMachOFrameWork.h" /* 2004-11-19 creedon */
+ #endif
  
  
***************
*** 223,226 ****
--- 225,238 ----
  		unsigned long x;
  		
+ 		#if TARGET_API_MAC_CARBON == 1 /*PBS 7.028: system.environment.isCarbon*/
+ 		
+ 			/* 2004-11-19 creedon - added hcommand, hreturn, bs, response */
+ 			Handle hcommand, hreturn;
+ 			bigstring bs;
+ 			UInt32 response;
+ 			OSErr err;
+ 		
+ 		#endif
+ 		
  		gestalt (gestaltSystemVersion, &x);
  		
***************
*** 244,252 ****
  		#if TARGET_API_MAC_CARBON == 1 /*PBS 7.028: system.environment.isCarbon*/
  
- 			/* 2004-11-19 creedon - added hcommand, hreturn, bs, response */
- 			Handle hcommand, hreturn;
- 			bigstring bs;
- 			UInt32 response;
- 			
  			langassignbooleanvalue (ht, str_isCarbon, true);
  			
--- 256,259 ----
***************
*** 287,291 ****
  			/* This needs to be checked on Mac OS Classic as well as Mac OS 9 proper. */
  			
! 			OSErr err = gestalt (gestaltMacOSCompatibilityBoxAttr, &response);
  			
  			if ((err == noErr) && ((response & (1 << gestaltMacOSCompatibilityBoxPresent)) != 0))
--- 294,298 ----
  			/* This needs to be checked on Mac OS Classic as well as Mac OS 9 proper. */
  			
! 			err = gestalt (gestaltMacOSCompatibilityBoxAttr, &response);
  			
  			if ((err == noErr) && ((response & (1 << gestaltMacOSCompatibilityBoxPresent)) != 0))
***************
*** 305,309 ****
  			langassignbooleanvalue (ht, str_isCarbon, false);
  
! 			bsos = "\x06" "Mac OS" /* 2004-11-19 creedon - Mac OS, used to be Macintosh*/ 
  			
  			isMacOsClassic = true; /* 2004-11-19 creedon */
--- 312,316 ----
  			langassignbooleanvalue (ht, str_isCarbon, false);
  
! 			copystring ("\x06" "Mac OS", bsos); /* 2004-11-19 creedon - Mac OS, used to be Macintosh*/ 
  			
  			isMacOsClassic = true; /* 2004-11-19 creedon */