[frontierkernel-commits] Frontier/Common/source shellprint.c,1.6,1.7

[Karsten W. <kar...@us...>]

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

Modified Files:
	shellprint.c 
Log Message:
fixing compile errors on windows

Index: shellprint.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellprint.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shellprint.c	15 Dec 2005 21:40:10 -0000	1.6
--- shellprint.c	26 Jan 2006 16:19:58 -0000	1.7
***************
*** 170,174 ****
--- 170,178 ----
  carbonValidSession(void)
  {
+ #if TARGET_API_MAC_CARBON == 1
  	return (nil != shellprintinfo.printhandle);
+ #else
+ 	return (false);
+ #endif
  }
  
***************
*** 177,182 ****
  carbonSessionPrintSession()
  {
- 	OSStatus	theErr;
  #if TARGET_API_MAC_CARBON == 1
  
  	if (nil == shellprintinfo.printhandle)
--- 181,186 ----
  carbonSessionPrintSession()
  {
  #if TARGET_API_MAC_CARBON == 1
+ 	OSStatus	theErr;
  
  	if (nil == shellprintinfo.printhandle)
***************
*** 198,206 ****
  carbonSessionDefaultPageAndSettingValidate(void)
  {
  	OSStatus	theErr;
  	Boolean		f;
! 
! #if TARGET_API_MAC_CARBON == 1
! 
  	theErr = PMSessionDefaultPageFormat(
  										shellprintinfo.printhandle,
--- 202,210 ----
  carbonSessionDefaultPageAndSettingValidate(void)
  {
+ #if TARGET_API_MAC_CARBON == 1
  	OSStatus	theErr;
  	Boolean		f;
! 	
! 	
  	theErr = PMSessionDefaultPageFormat(
  										shellprintinfo.printhandle,
***************
*** 227,231 ****
  		goto error;
  
- #endif
  	
  	return (true);
--- 231,234 ----
***************
*** 233,236 ****
--- 236,241 ----
  error:
  		carbonKillPrintVars();
+ 
+ #endif
  	
  	return false;
***************
*** 242,247 ****
  carbonCreateFormatAndSetting(void)
  {
- 	OSStatus	theErr;
  #if TARGET_API_MAC_CARBON == 1
  
  	theErr = PMCreatePageFormat(&shellprintinfo.pageformat);
--- 247,252 ----
  carbonCreateFormatAndSetting(void)
  {
  #if TARGET_API_MAC_CARBON == 1
+ 	OSStatus	theErr;
  
  	theErr = PMCreatePageFormat(&shellprintinfo.pageformat);
***************
*** 253,257 ****
  		goto error;
  
- #endif
  	return (true);
  	
--- 258,261 ----
***************
*** 259,262 ****
--- 263,267 ----
  		carbonKillPrintVars();
  	
+ #endif
  	return false;
  }