[frontierkernel-commits] Frontier/Common/source osamenus.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-serv8925/Frontier/Common/source

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

Index: osamenus.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osamenus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osamenus.c	9 Oct 2004 07:55:44 -0000	1.1
--- osamenus.c	23 Oct 2004 22:46:55 -0000	1.2
***************
*** 24,27 ****
--- 24,30 ----
  ******************************************************************************/
  
+ #include "frontier.h"
+ #include "standard.h"
+ 
  /*Forked. Carbon version at the top, "good" version at the bottom. This file should be
  reconciled later.*/
***************
*** 32,43 ****
  /*© Copyright 1992-1993 UserLand Software, Inc.  All Rights Reserved.*/
  
- 
- #include <Processes.h>
- #include <AERegistry.h>
- #include <Menus.h>
- #include <Components.h>
- #include <OSA.h>
  #include <land.h>
- #include <standard.h>
  #include "dialogs.h"
  #include "ops.h"
--- 35,39 ----
***************
*** 1095,1099 ****
  	OSErr err;
  	
! 	#if TARGET_API_MAC_CARBON == 1	
  	HandleMenuDirtyDesc = NewAEEventHandlerUPP(HandleMenuDirty);
  	#endif
--- 1091,1095 ----
  	OSErr err;
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	HandleMenuDirtyDesc = NewAEEventHandlerUPP(HandleMenuDirty);
  	#endif
***************
*** 1370,1374 ****
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:32:00 PM
  	//get rid of the UPPs
! 	#if TARGET_API_MAC_CARBON == 1
  	DisposeComponentFunctionUPP(menucandofunctionDesc);
  	DisposeComponentFunctionUPP(osaInitSharedMenusDesc);
--- 1366,1370 ----
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:32:00 PM
  	//get rid of the UPPs
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	DisposeComponentFunctionUPP(menucandofunctionDesc);
  	DisposeComponentFunctionUPP(osaInitSharedMenusDesc);
***************
*** 1411,1415 ****
  	long id;
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:28:35 PM
  	//create the upps
--- 1407,1411 ----
  	long id;
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	//Code change by Timothy Paustian Friday, July 21, 2000 11:28:35 PM
  	//create the upps
***************
*** 1645,1656 ****
  /*© Copyright 1992-1993 UserLand Software, Inc.  All Rights Reserved.*/
  
- 
- #include <Processes.h>
- #include <AERegistry.h>
- #include <Menus.h>
- #include <Components.h>
- #include <OSA.h>
  #include <land.h>
- #include <standard.h>
  #include "dialogs.h"
  #include "ops.h"
--- 1641,1645 ----