[frontierkernel-commits] Frontier/Common/source dockmenu.c,1.4,1.5, file.c,1.4,1.5, langops.c,1.4,1.5, menu.c,1.8,1.9, shellupdate.c,1.4,1.5, shellwindowverbs.c,1.5,1.6, sounds.c,1.4,1.5, wpengine.c,1.10,1.11,

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

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

Modified Files:
	dockmenu.c file.c langops.c menu.c shellupdate.c 
	shellwindowverbs.c sounds.c wpengine.c 
Log Message:
Changed some #ifs into #ifdefs for better cross-compiler compatibility.

Index: shellupdate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellupdate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shellupdate.c	11 Jan 2005 22:48:10 -0000	1.4
--- shellupdate.c	6 Mar 2006 21:54:23 -0000	1.5
***************
*** 247,251 ****
  
  	
! #if WIN95VERSION && fldebug
  
  /****** DEBUG CODE *********/
--- 247,251 ----
  
  	
! #if defined(WIN95VERSION) && fldebug
  
  /****** DEBUG CODE *********/

Index: wpengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wpengine.c	8 Feb 2006 21:35:17 -0000	1.10
--- wpengine.c	6 Mar 2006 21:54:23 -0000	1.11
***************
*** 1484,1488 ****
  	else if (flupdating) {
  
! 		#if WIN95VERSION
  			pgInitDevice (&ws_globals, (generic_var) getcurrentDC (), MEM_NULL, &port);
  			port.machine_ref3 = port.machine_var; // default place to get DC
--- 1484,1488 ----
  	else if (flupdating) {
  
! 		#ifdef WIN95VERSION
  			pgInitDevice (&ws_globals, (generic_var) getcurrentDC (), MEM_NULL, &port);
  			port.machine_ref3 = port.machine_var; // default place to get DC
***************
*** 1829,1833 ****
  		hdlregion updatergn = nil;
  		
! 		#if WIN95VERSION
  		graf_device	port;
  		
--- 1829,1833 ----
  		hdlregion updatergn = nil;
  		
! 		#ifdef WIN95VERSION
  		graf_device	port;
  		
***************
*** 1876,1880 ****
  		wpframedisplay ();
  		
! 		#if WIN95VERSION
  			if (updatergn != nil)
  				pgCloseDevice (&ws_globals, &port);
--- 1876,1880 ----
  		wpframedisplay ();
  		
! 		#ifdef WIN95VERSION
  			if (updatergn != nil)
  				pgCloseDevice (&ws_globals, &port);

Index: sounds.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/sounds.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sounds.c	11 Jan 2005 22:48:10 -0000	1.4
--- sounds.c	6 Mar 2006 21:54:23 -0000	1.5
***************
*** 84,88 ****
  boolean dosound (short duration, short amplitude, short frequency) {
  	
! #if MACVERSION
  	//#if TARGET_API_MAC_CARBON
  	//sysbeep();
--- 84,88 ----
  boolean dosound (short duration, short amplitude, short frequency) {
  	
! #ifdef MACVERSION
  	//#if TARGET_API_MAC_CARBON
  	//sysbeep();
***************
*** 140,144 ****
  #endif
  
! #if WIN95VERSION
  	//NOTE:  Beep does not take amplitude.  
  	//       Also the parameters are ignored on Windows 95/98
--- 140,144 ----
  #endif
  
! #ifdef WIN95VERSION
  	//NOTE:  Beep does not take amplitude.  
  	//       Also the parameters are ignored on Windows 95/98
***************
*** 177,181 ****
  boolean playnamedsound (bigstring bsname) {
  
! #if MACVERSION
  	Handle hsound;
  	
--- 177,181 ----
  boolean playnamedsound (bigstring bsname) {
  
! #ifdef MACVERSION
  	Handle hsound;
  	
***************
*** 188,192 ****
  #endif
  
! #if WIN95VERSION
  	char sndname[256];
  	copyptocstring (bsname, sndname);
--- 188,192 ----
  #endif
  
! #ifdef WIN95VERSION
  	char sndname[256];
  	copyptocstring (bsname, sndname);

Index: shellwindowverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindowverbs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shellwindowverbs.c	1 Oct 2005 17:22:48 -0000	1.5
--- shellwindowverbs.c	6 Mar 2006 21:54:23 -0000	1.6
***************
*** 408,412 ****
  			} /*switch*/
  
! 		#if WIN95VERSION || TARGET_API_MAC_CARBON /*8.0.3b2: Windows and OS X only. Fixes missing scrollbar on Classic.*/
  		
  			shellpushglobals ((**hinfo).macwindow);		
--- 408,412 ----
  			} /*switch*/
  
! 		#if defined(WIN95VERSION) || TARGET_API_MAC_CARBON /*8.0.3b2: Windows and OS X only. Fixes missing scrollbar on Classic.*/
  		
  			shellpushglobals ((**hinfo).macwindow);		

Index: file.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** file.c	11 Jan 2005 22:48:05 -0000	1.4
--- file.c	6 Mar 2006 21:54:23 -0000	1.5
***************
*** 892,896 ****
  boolean filegetfilename (const tyfilespec *pfs, bigstring name) {
  
! #if MACVERSION
  	/*
  	filespecs for volumes have their strings set to the empty string.
--- 892,896 ----
  boolean filegetfilename (const tyfilespec *pfs, bigstring name) {
  
! #ifdef MACVERSION
  	/*
  	filespecs for volumes have their strings set to the empty string.
***************
*** 905,909 ****
  #endif
  
! #if WIN95VERSION
  	lastword ((ptrstring) fsname (pfs), '\\', name);
  
--- 905,909 ----
  #endif
  
! #ifdef WIN95VERSION
  	lastword ((ptrstring) fsname (pfs), '\\', name);
  

Index: dockmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dockmenu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dockmenu.c	11 Jan 2005 22:48:05 -0000	1.4
--- dockmenu.c	6 Mar 2006 21:54:23 -0000	1.5
***************
*** 53,57 ****
  
  
! #if MACVERSION
  	UInt32 menuid;
  	short idsubmenu;
--- 53,57 ----
  
  
! #ifdef MACVERSION
  	UInt32 menuid;
  	short idsubmenu;
***************
*** 61,70 ****
  
  
! #if WIN95VERSION
  	short menuid;
  #endif
  
  
! #if MACVERSION
  
  	typedef struct typopupinfo {
--- 61,70 ----
  
  
! #ifdef WIN95VERSION
  	short menuid;
  #endif
  
  
! #ifdef MACVERSION
  
  	typedef struct typopupinfo {
***************
*** 95,99 ****
  static void dockmenuresetmenustack (void) {
  	
! 	#if MACVERSION
  	
  		dockmenudisposemenusinstack ();
--- 95,99 ----
  static void dockmenuresetmenustack (void) {
  	
! 	#ifdef MACVERSION
  	
  		dockmenudisposemenusinstack ();
***************
*** 115,119 ****
  	*/
  	
! 	#if MACVERSION
  	
  		short ix = dockmenustack.currstackitem;
--- 115,119 ----
  	*/
  	
! 	#ifdef MACVERSION
  	
  		short ix = dockmenustack.currstackitem;
***************
*** 157,161 ****
  static boolean dockmenuaddtomenustack (hdlmenu hmenu, short id) {
  
! 	#if MACVERSION
  
  		short ix = dockmenustack.currstackitem + 1;
--- 157,161 ----
  static boolean dockmenuaddtomenustack (hdlmenu hmenu, short id) {
  
! 	#ifdef MACVERSION
  
  		short ix = dockmenustack.currstackitem + 1;
***************
*** 185,189 ****
  	short id = defaultpopupmenuid;
  
! 	#if MACVERSION
  		idsubmenu++;
  		
--- 185,189 ----
  	short id = defaultpopupmenuid;
  
! 	#ifdef MACVERSION
  		idsubmenu++;
  		
***************
*** 193,197 ****
  	hsubmenu = Newmenu (id, "");
  
! 	#if MACVERSION	
  		InsertMenu (hsubmenu, -1);
  	#endif
--- 193,197 ----
  	hsubmenu = Newmenu (id, "");
  
! 	#ifdef MACVERSION	
  		InsertMenu (hsubmenu, -1);
  	#endif
***************
*** 270,274 ****
  		dockmenuinsertsubmenu (hmenu, itemnumber, hnode);
  
! 	#if MACVERSION
  		flstackneedsdisposing = true;
  	#endif
--- 270,274 ----
  		dockmenuinsertsubmenu (hmenu, itemnumber, hnode);
  
! 	#ifdef MACVERSION
  		flstackneedsdisposing = true;
  	#endif
***************
*** 483,487 ****
  #endif
  
! #if WIN95VERSION
  
  void rundockmenu (void) {
--- 483,487 ----
  #endif
  
! #ifdef WIN95VERSION
  
  void rundockmenu (void) {

Index: langops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langops.c	11 Jan 2005 22:48:07 -0000	1.4
--- langops.c	6 Mar 2006 21:54:23 -0000	1.5
***************
*** 878,882 ****
  			}
  		
! 		#if __powerc || WIN95VERSION
  		
  			case doublevaluetype:
--- 878,882 ----
  			}
  		
! 		#if defined(__powerc) || defined(WIN95VERSION)
  		
  			case doublevaluetype:

Index: menu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** menu.c	4 Mar 2006 22:58:40 -0000	1.8
--- menu.c	6 Mar 2006 21:54:23 -0000	1.9
***************
*** 54,58 ****
  
  
! #if WIN95VERSION
  
  extern HWND shellframewindow;
--- 54,58 ----
  
  
! #ifdef WIN95VERSION
  
  extern HWND shellframewindow;
***************
*** 342,346 ****
  	#endif
  
! 	#if WIN95VERSION
  		releasethreadglobals ();
  		
--- 342,346 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		releasethreadglobals ();
  		
***************
*** 486,490 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
--- 486,490 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
***************
*** 511,515 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
--- 511,515 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
***************
*** 558,562 ****
  	#endif
  
! 	#if WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  		MENUITEMINFO info;
--- 558,562 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  		MENUITEMINFO info;
***************
*** 583,587 ****
  	#endif
  
! 	#if WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  		
--- 583,587 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  		
***************
*** 595,599 ****
  
  
! #if MACVERSION && !flruntime
  
  long trackmenu (Point mousept) {
--- 595,599 ----
  
  
! #if defined(MACVERSION) && !flruntime
  
  long trackmenu (Point mousept) {
***************
*** 741,745 ****
  	#endif
  
! 	#if WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  
--- 741,745 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		HMENU menubar = GetMenu (shellframewindow);
  
***************
*** 782,786 ****
  	#endif
  
! 	#if WIN95VERSION
  		if (item < 0) /*this item has been dummied out -- do nothing*/
  			return;
--- 782,786 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		if (item < 0) /*this item has been dummied out -- do nothing*/
  			return;
***************
*** 807,811 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
--- 807,811 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		HMENU menubar = GetMenu (shellframewindow);
***************
*** 907,911 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		
--- 907,911 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		
***************
*** 937,941 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		
--- 937,941 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		
***************
*** 964,968 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		
--- 964,968 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		
***************
*** 992,996 ****
  	#endif
  
! 	#if WIN95VERSION
  		
  	#endif
--- 992,996 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		
  	#endif
***************
*** 1035,1039 ****
  	#endif
  
! 	#if WIN95VERSION
  		hdlmenu mainmenu, hreturn;
  		MENUITEMINFO mi;
--- 1035,1039 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		hdlmenu mainmenu, hreturn;
  		MENUITEMINFO mi;
***************
*** 1076,1080 ****
  	#endif
  
! 	#if WIN95VERSION
  		hdlmenu mainmenu, hreturn;
  		MENUITEMINFO info;
--- 1076,1080 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		hdlmenu mainmenu, hreturn;
  		MENUITEMINFO info;
***************
*** 1126,1130 ****
  	#endif
  
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		char item [256];
--- 1126,1130 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		char item [256];
***************
*** 1171,1175 ****
  boolean getmenuitem (hdlmenu hmenu, short ixmenu, bigstring bs) {
  	
! 	#if WIN95VERSION
  		MENUITEMINFO info;
  		char menuname[128];
--- 1171,1175 ----
  boolean getmenuitem (hdlmenu hmenu, short ixmenu, bigstring bs) {
  	
! 	#ifdef WIN95VERSION
  		MENUITEMINFO info;
  		char menuname[128];
***************
*** 1188,1192 ****
  	#endif
  
! 	#if WIN95VERSION
  		info.cbSize = sizeof (info);
  		info.fMask = MIIM_TYPE;
--- 1188,1192 ----
  	#endif
  
! 	#ifdef WIN95VERSION
  		info.cbSize = sizeof (info);
  		info.fMask = MIIM_TYPE;
***************
*** 1422,1426 ****
  #endif
  
! #if WIN95VERSION	
  	MENUITEMINFO info;
  	boolean fl;
--- 1422,1426 ----
  #endif
  
! #ifdef WIN95VERSION	
  	MENUITEMINFO info;
  	boolean fl;
***************
*** 1502,1506 ****
  #endif
  
! #if WIN95VERSION
  	boolean fl;
  	
--- 1502,1506 ----
  #endif
  
! #ifdef WIN95VERSION
  	boolean fl;
  	
***************
*** 1539,1543 ****
  #endif
  
! #if WIN95VERSION
  	if (restype == 'FONT') {
  
--- 1539,1543 ----
  #endif
  
! #ifdef WIN95VERSION
  	if (restype == 'FONT') {