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

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

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

Modified Files:
	shellprint.c 
Log Message:
reenabling OS9 compilation

Index: shellprint.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellprint.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shellprint.c	5 Dec 2005 20:33:56 -0000	1.5
--- shellprint.c	15 Dec 2005 21:40:10 -0000	1.6
***************
*** 178,182 ****
  {
  	OSStatus	theErr;
! 	
  	if (nil == shellprintinfo.printhandle)
  	{
--- 178,183 ----
  {
  	OSStatus	theErr;
! #if TARGET_API_MAC_CARBON == 1
! 
  	if (nil == shellprintinfo.printhandle)
  	{
***************
*** 189,193 ****
  		}
  	}
! 	
  	return(true);
  }
--- 190,194 ----
  		}
  	}
! #endif	
  	return(true);
  }
***************
*** 199,203 ****
  	OSStatus	theErr;
  	Boolean		f;
! 	
  	theErr = PMSessionDefaultPageFormat(
  										shellprintinfo.printhandle,
--- 200,206 ----
  	OSStatus	theErr;
  	Boolean		f;
! 
! #if TARGET_API_MAC_CARBON == 1
! 
  	theErr = PMSessionDefaultPageFormat(
  										shellprintinfo.printhandle,
***************
*** 223,226 ****
--- 226,231 ----
  	if(theErr != noErr)
  		goto error;
+ 
+ #endif
  	
  	return (true);
***************
*** 238,242 ****
  {
  	OSStatus	theErr;
! 	
  	theErr = PMCreatePageFormat(&shellprintinfo.pageformat);
  	if(theErr != noErr || (shellprintinfo.pageformat == kPMNoPageFormat))
--- 243,248 ----
  {
  	OSStatus	theErr;
! #if TARGET_API_MAC_CARBON == 1
! 
  	theErr = PMCreatePageFormat(&shellprintinfo.pageformat);
  	if(theErr != noErr || (shellprintinfo.pageformat == kPMNoPageFormat))
***************
*** 246,250 ****
  	if(theErr != noErr)
  		goto error;
! 	
  	return (true);
  	
--- 252,257 ----
  	if(theErr != noErr)
  		goto error;
! 
! #endif
  	return (true);