frontierkernel-commits — Mailing list for Subversion commit messages.

[frontierkernel-commits] Frontier/Common/headers font.h,1.1,1.2 mouse.h,1.1,1.2 scripts.h,1.1,1.2

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

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

Modified Files:
	font.h mouse.h scripts.h 
Log Message:
Fix GCC compiler warning.

Index: mouse.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/mouse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mouse.h	9 Oct 2004 21:00:48 -0000	1.1
--- mouse.h	31 Oct 2004 13:02:36 -0000	1.2
***************
*** 81,85 ****
  extern void mousedown (long eventwhen, long eventposx, long eventposy, long eventwhat);
  
! extern boolean mousedoubleclick ();
  
  extern boolean ismouseleftclick (void);
--- 81,85 ----
  extern void mousedown (long eventwhen, long eventposx, long eventposy, long eventwhat);
  
! extern boolean mousedoubleclick (void);
  
  extern boolean ismouseleftclick (void);

Index: scripts.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/scripts.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scripts.h	9 Oct 2004 21:06:19 -0000	1.1
--- scripts.h	31 Oct 2004 13:02:36 -0000	1.2
***************
*** 48,52 ****
  extern long specialoneshotscriptsrunning (void);
  
! extern boolean scriptinstallscripts (hdlhashtable);
  
  extern boolean scriptinstallagent (hdlhashnode);
--- 48,52 ----
  extern long specialoneshotscriptsrunning (void);
  
! //extern boolean scriptinstallscripts (hdlhashtable);
  
  extern boolean scriptinstallagent (hdlhashnode);

Index: font.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/font.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** font.h	9 Oct 2004 20:55:10 -0000	1.1
--- font.h	31 Oct 2004 13:02:36 -0000	1.2
***************
*** 68,72 ****
  extern void diskgetfontnum (diskfontstring, short *);
  
! extern boolean initfonts ();
  
  #ifdef WIN95VERSION
--- 68,72 ----
  extern void diskgetfontnum (diskfontstring, short *);
  
! extern boolean initfonts (void);
  
  #ifdef WIN95VERSION

[frontierkernel-commits] Frontier/Common/source menu.c,1.2,1.3 icon.c,1.2,1.3 about.c,1.3,1.4 memory.c,1.2,1.3 services.c,1.2,1.3 main.c,1.2,1.3 mouse.c,1.2,1.3 scrollbar.c,1.2,1.3 launch.c,1.4,1.5 font.c,1.2,1.3 scripts.c,1.2,1.3 frontierdebug.c,1.2,1.3

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

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

Modified Files:
	menu.c icon.c about.c memory.c services.c main.c mouse.c 
	scrollbar.c launch.c font.c scripts.c frontierdebug.c 
Log Message:
Fix GCC compiler warning.

Index: scrollbar.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scrollbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scrollbar.c	23 Oct 2004 22:51:11 -0000	1.2
--- scrollbar.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 84,88 ****
  	
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	CGrafPtr	contrlOwner = GetControlOwner(h);
  	Rect		contrlRect;
  	
--- 84,88 ----
  	
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	CGrafPtr	contrlOwner = (CGrafPtr) GetControlOwner(h);
  	Rect		contrlRect;
  	
***************
*** 104,127 ****
  	
  	
- static void invalscrollbar (hdlscrollbar hscrollbar) {
- #ifdef MACVERSION
- 	register hdlscrollbar h = hscrollbar;
- 	//Code change by Timothy Paustian Friday, May 5, 2000 10:16:35 PM
- 	//Changed to Opaque call for Carbon
- 	//This routine is never called in the PPC OT version.
- 	if (h != nil) 
- 	{	
- 		#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
- 		Rect contrlRect;
- 		GetControlBounds(h, &contrlRect);
- 		invalrect (contrlRect);
- 		#else
- 		invalrect((**h).contrlRect);
- 		#endif
- 	}
- #endif
- 	} /*invalscrollbar*/
- 	
- 	
  boolean pointinscrollbar (Point pt, hdlscrollbar hscrollbar) {
  #ifdef MACVERSION
--- 104,107 ----
***************
*** 366,370 ****
  	getscrollbarinfo (h, &scrollinfo);
  	
! /*	if (scrollinfo.min <= scrollinfo.max) /*there's something to scroll to*/
  
  	/*7.0b17 PBS: scroll if min < max, not if min <= max.*/
--- 346,350 ----
  	getscrollbarinfo (h, &scrollinfo);
  	
! 	//if (scrollinfo.min <= scrollinfo.max) /*there's something to scroll to*/
  
  	/*7.0b17 PBS: scroll if min < max, not if min <= max.*/
***************
*** 417,421 ****
  	SetControlValue (h, min (infinity, (*scrollinfo).cur));
  	
! #if __powerc
  
  	if (flmacproportionalthumbs) /*7.0b18 PBS: proportional thumbs on Macs*/
--- 397,401 ----
  	SetControlValue (h, min (infinity, (*scrollinfo).cur));
  	
! //#if __powerc || __GNUC__
  
  	if (flmacproportionalthumbs) /*7.0b18 PBS: proportional thumbs on Macs*/
***************
*** 423,427 ****
  		SetControlViewSize (h, (*scrollinfo).pag);
  
! #endif
  	
  	scrollbarpopclip ();
--- 403,407 ----
  		SetControlViewSize (h, (*scrollinfo).pag);
  
! //#endif
  	
  	scrollbarpopclip ();

Index: font.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** font.c	23 Oct 2004 22:20:03 -0000	1.2
--- font.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 425,434 ****
  
  
! /*
  void fontstring (short fontnum, short fontsize, boolean flhavefont, boolean flhavesize, bigstring bs) {
  	
  	bigstring bsint;
  	
! 	setstringlength(bs,0); /*set it to the empty string%/
  	
  	if (flhavefont)
--- 425,435 ----
  
  
! #if 0
! 
  void fontstring (short fontnum, short fontsize, boolean flhavefont, boolean flhavesize, bigstring bs) {
  	
  	bigstring bsint;
  	
! 	setstringlength(bs,0); /*set it to the empty string*/
  	
  	if (flhavefont)
***************
*** 451,455 ****
  
  
! /*
  void getstyle (style, flplain, flbold, flitalic, flunderline, floutline, flshadow) 
  
--- 452,456 ----
  
  
! 
  void getstyle (style, flplain, flbold, flitalic, flunderline, floutline, flshadow) 
  
***************
*** 460,464 ****
  	if none of the others are true, we set flplain to true.  otherwise 
  	flplain is false.
! 	%/
  
  	short style; 
--- 461,465 ----
  	if none of the others are true, we set flplain to true.  otherwise 
  	flplain is false.
! 	*/
  
  	short style; 
***************
*** 466,470 ****
  	
  	{
! 	*flplain = true;  /*default values%/
  	
  	*flbold = false;
--- 467,471 ----
  	
  	{
! 	*flplain = true;  /*default values*/
  	
  	*flbold = false;
***************
*** 523,527 ****
  		}
  	} /*getstyle*/
!    
  
  void diskgetfontname (short fontnum, diskfontstring fontname) {
--- 524,530 ----
  		}
  	} /*getstyle*/
! 
! #endif
! 
  
  void diskgetfontname (short fontnum, diskfontstring fontname) {
***************
*** 552,556 ****
  	
  		
! boolean initfonts () {
  	
  	#ifdef WIN95VERSION
--- 555,559 ----
  	
  		
! boolean initfonts (void) {
  	
  	#ifdef WIN95VERSION

Index: mouse.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/mouse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mouse.c	23 Oct 2004 22:37:54 -0000	1.2
--- mouse.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 342,364 ****
  	} /*mousedoubleclick*/
  
  boolean ismouseleftclick (void) {
  
  	return (mousestatus.whichbutton == leftmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismouserightclick (void) {
  
  	return (mousestatus.whichbutton == rightmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismousecenterclick (void) {
  
  	return (mousestatus.whichbutton == centermousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismousewheelclick (void) {
  
  	return (mousestatus.whichbutton == wheelmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  
--- 342,368 ----
  	} /*mousedoubleclick*/
  
+ 
  boolean ismouseleftclick (void) {
  
  	return (mousestatus.whichbutton == leftmousebuttonaction);
! 	} /*ismouseleftclick*/
! 
  
  boolean ismouserightclick (void) {
  
  	return (mousestatus.whichbutton == rightmousebuttonaction);
! 	} /*ismouserightclick*/
! 
  
  boolean ismousecenterclick (void) {
  
  	return (mousestatus.whichbutton == centermousebuttonaction);
! 	} /*ismousecenterclick*/
! 
  
  boolean ismousewheelclick (void) {
  
  	return (mousestatus.whichbutton == wheelmousebuttonaction);
! 	} /*ismousewheelclick*/
  
  
***************
*** 508,512 ****
  		for (j = 0; j <= 100; j++) {
  			
! 			/*
  			if (optionkeydown ())
  				return;
--- 512,516 ----
  		for (j = 0; j <= 100; j++) {
  			
! 			/%
  			if (optionkeydown ())
  				return;
***************
*** 519,523 ****
  			smashmouse (pt);
  			
! 			/*
  			copystring ("\p(h = ", bs);
  			
--- 523,527 ----
  			smashmouse (pt);
  			
! 			/%
  			copystring ("\p(h = ", bs);
  			
***************
*** 534,538 ****
  			}
  		}
! 	} /*smashmousetester*/
  
  
--- 538,543 ----
  			}
  		}
! 	} /%smashmousetester%/
! */
  
  

Index: launch.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/launch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** launch.c	26 Oct 2004 21:53:17 -0000	1.4
--- launch.c	31 Oct 2004 13:02:23 -0000	1.5
***************
*** 953,960 ****
  		AECreateList (nil, 0, false, &doclist); /*create list for the fsspec*/
  		
! 		/*
! 		AEPutPtr (&doclist, 0, typeFSS, (Ptr) &fs, sizeof (fs)); /* put filespec on the list%/
! 		*/		
! 		
  		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
--- 953,958 ----
  		AECreateList (nil, 0, false, &doclist); /*create list for the fsspec*/
  		
! 		//AEPutPtr (&doclist, 0, typeFSS, (Ptr) &fs, sizeof (fs)); /* put filespec on the list%/
! 				
  		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
***************
*** 987,991 ****
  	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
! 		copydatahandle (&launchdesc, appparams);
  
  	#else
--- 985,989 ----
  	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
! 		copydatahandle (&launchdesc, (Handle*) appparams);
  
  	#else
***************
*** 1070,1076 ****
  			if (!fileexists (fsapp, &flfolder)) {
  			
! 				(*fsapp).name [0] = lenname; /*pop off the .app suffix+/
! 				} /*if+/
! 			} /*if+/
  		}
  		*/
--- 1068,1074 ----
  			if (!fileexists (fsapp, &flfolder)) {
  			
! 				(*fsapp).name [0] = lenname; /%pop off the .app suffix%/
! 				} /%if%/
! 			} /%if%/
  		}
  		*/

Index: scripts.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scripts.c	23 Oct 2004 22:50:50 -0000	1.2
--- scripts.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 136,148 ****
  	hdlhashnode localtablestack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
! 	/***Handle localtableformatsstack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
  	short toplocaltable; /*table stack pointer*/
  	
! 	/*
! 	short deferredbuttonnum; /*see scriptdeferbutton%/
  	
! 	WindowPtr deferredwindow; /*ditto%/
! 	*/
  	
  	hdlheadrecord hbarcursor; /*the headline we've most recently shown*/
--- 136,146 ----
  	hdlhashnode localtablestack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
! 	//Handle localtableformatsstack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
  	short toplocaltable; /*table stack pointer*/
  	
! 	//short deferredbuttonnum; /*see scriptdeferbutton*/
  	
! 	//WindowPtr deferredwindow; /*ditto*/
  	
  	hdlheadrecord hbarcursor; /*the headline we've most recently shown*/
***************
*** 184,190 ****
  static hdldebuggerrecord debuggerdata = nil;
  
! static boolean flenablemenus = false;
  
! static short scriptbackgrounddisable = 0; /*it's possible to temporarily disable backgrounding*/
  
  //static long scriptbackgroundtime = 0;
--- 182,188 ----
  static hdldebuggerrecord debuggerdata = nil;
  
! //static boolean flenablemenus = false;
  
! //static short scriptbackgrounddisable = 0; /*it's possible to temporarily disable backgrounding*/
  
  //static long scriptbackgroundtime = 0;
***************
*** 209,213 ****
  	
  	++scriptbackgrounddisable;
! 	} /*disablescriptbackground%/
  
  
--- 207,211 ----
  	
  	++scriptbackgrounddisable;
! 	} /%disablescriptbackground%/
  
  
***************
*** 215,219 ****
  	
  	--scriptbackgrounddisable;
! 	} /*enablescriptbackground%/
  */
  
--- 213,217 ----
  	
  	--scriptbackgrounddisable;
! 	} /%enablescriptbackground%/
  */
  
***************
*** 232,237 ****
  	
  	scriptbackgroundtime = gettickcount ();
! 	} /*scriptresetbackgroundtime*/
! 
  
  static boolean isheadrecordhandle (long refcon) {
--- 230,235 ----
  	
  	scriptbackgroundtime = gettickcount ();
! 	} /%scriptresetbackgroundtime%/
! */
  
  static boolean isheadrecordhandle (long refcon) {
***************
*** 494,500 ****
  	
  	/*
! 	if (hashnodeintable (hnode, agentstable)) { /*special stuff for agents%/
  		
! 		if (!processreplacecode (holdcode, hnewcode)) { /*no replacement, add new process%/
  			
  			langdisposetree (holdcode);
--- 492,498 ----
  	
  	/*
! 	if (hashnodeintable (hnode, agentstable)) { /%special stuff for agents%/
  		
! 		if (!processreplacecode (holdcode, hnewcode)) { /%no replacement, add new process%/
  			
  			langdisposetree (holdcode);
***************
*** 1162,1166 ****
  	bigstring bstrap;
  	boolean fl;
! 	boolean scriptdebuggereventloop (void); //forward
  	hdlhashnode hhashnode;
  	#define str_userdebugprefs ("\x10" "user.prefs.debug")
--- 1160,1164 ----
  	bigstring bstrap;
  	boolean fl;
! 	static boolean scriptdebuggereventloop (void); //forward
  	hdlhashnode hhashnode;
  	#define str_userdebugprefs ("\x10" "user.prefs.debug")
***************
*** 1444,1448 ****
  #ifdef flcomponent
  
! static pascal OSErr handlerecordedtext (AppleEvent *event, AppleEvent *reply, long refcon) {
  	
  	/*
--- 1442,1446 ----
  #ifdef flcomponent
  
! static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
  	
  	/*
***************
*** 1684,1688 ****
  
  
! static pascal OSErr handlestoprecording (AppleEvent *event, AppleEvent *reply, long refcon) {
  	
  	/*
--- 1682,1686 ----
  
  
! static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
  	
  	/*
***************
*** 1872,1876 ****
  	
  	/*
! 	if (!processyieldtoagents ()) /*file closed while agents were finishing up%/
  		return (false);
  	*/
--- 1870,1874 ----
  	
  	/*
! 	if (!processyieldtoagents ()) /%file closed while agents were finishing up%/
  		return (false);
  	*/
***************
*** 1918,1922 ****
  	
  	/*
! 	if ((**hd).flscriptsuspended && !debuggingcurrentprocess ()) { /*defer background hits%/
  		
  		if (buttonnum != installbutton) {
--- 1916,1920 ----
  	
  	/*
! 	if ((**hd).flscriptsuspended && !debuggingcurrentprocess ()) { /%defer background hits%/
  		
  		if (buttonnum != installbutton) {
***************
*** 2102,2106 ****
  	else {
  		
! 		if ((x != runbutton) && (x != debugbutton) && (x != installbutton)) /*rule 1%/
  			return (false);
  		}
--- 2100,2104 ----
  	else {
  		
! 		if ((x != runbutton) && (x != debugbutton) && (x != installbutton)) /%rule 1%/
  			return (false);
  		}
***************
*** 2252,2256 ****
  
  
! /*
  boolean scriptkilled (void) {
  	
--- 2250,2255 ----
  
  
! #if 0
! 
  boolean scriptkilled (void) {
  	
***************
*** 2262,2266 ****
  	it's handled by returning false from the debugger routine.  checking 
  	it here will wrongly terminate some other process
! 	%/
  	
  	register hdldebuggerrecord hd = debuggerdata;
--- 2261,2265 ----
  	it's handled by returning false from the debugger routine.  checking 
  	it here will wrongly terminate some other process
! 	*/
  	
  	register hdldebuggerrecord hd = debuggerdata;
***************
*** 2269,2275 ****
  	if ((**hd).flscriptkilled) {
  		
! 		if (processisoneshot (false)) { /*we're running a one-shot process%/
  			
! 			(**hd).flscriptkilled = false; /*consume it%/
  			
  			scriptprocesskilled ();
--- 2268,2274 ----
  	if ((**hd).flscriptkilled) {
  		
! 		if (processisoneshot (false)) { /%we're running a one-shot process%/
  			
! 			(**hd).flscriptkilled = false; /%consume it%/
  			
  			scriptprocesskilled ();
***************
*** 2278,2288 ****
  			}
  		}
! 	%/
  	
! 	if (keyboardescape ()) { /*user pressed cmd-period or something like that%/
  		
! 		if (processisoneshot (true)) { /*cmd-period doesn't kill background tasks%/
  			
! 			keyboardclearescape (); /*consume it%/
  			
  			return (true);
--- 2277,2287 ----
  			}
  		}
! 	*/
  	
! 	if (keyboardescape ()) { /*user pressed cmd-period or something like that*/
  		
! 		if (processisoneshot (true)) { /*cmd-period doesn't kill background tasks*/
  			
! 			keyboardclearescape (); /*consume it*/
  			
  			return (true);
***************
*** 2293,2296 ****
--- 2292,2297 ----
  	} /*scriptkilled*/
  
+ #endif
+ 
  
  static boolean scriptdebuggercallback (void) {
***************
*** 2307,2311 ****
  	
  	/*
! 	if ((**hd).deferredbuttonnum > 0) /*a script button hit was deferred%/
  		return (false);
  	*/
--- 2308,2312 ----
  	
  	/*
! 	if ((**hd).deferredbuttonnum > 0) /%a script button hit was deferred%/
  		return (false);
  	*/
***************
*** 2341,2345 ****
  		
  		/*
! 		if ((**hd).deferredbuttonnum > 0) { /*a background button click was deferred%/
  			
  			shellpushglobals ((**hd).deferredwindow);
--- 2342,2346 ----
  		
  		/*
! 		if ((**hd).deferredbuttonnum > 0) { /%a background button click was deferred%/
  			
  			shellpushglobals ((**hd).deferredwindow);
***************
*** 2349,2353 ****
  			shellpopglobals ();
  			
! 			(**hd).deferredbuttonnum = 0; /*consume it%/
  			}
  		*/
--- 2350,2354 ----
  			shellpopglobals ();
  			
! 			(**hd).deferredbuttonnum = 0; /%consume it%/
  			}
  		*/
***************
*** 2423,2427 ****
  	short diff;
  	
! 	/*shellshorteventloop (); /*suck up and process any waiting events*/
  	
  	if (languserescaped (true)) /*stop running the script immediately*/
--- 2424,2428 ----
  	short diff;
  	
! 	//shellshorteventloop (); /*suck up and process any waiting events*/
  	
  	if (languserescaped (true)) /*stop running the script immediately*/
***************
*** 2472,2476 ****
  		
  		switch ((**hd).stepdir) {
! 			
  			case down:
  				if (diff == 0)
--- 2473,2477 ----
  		
  		switch ((**hd).stepdir) {
! 				
  			case down:
  				if (diff == 0)
***************
*** 2478,2497 ****
  				else
  					flshowline = diff < 0;
- 				
  				break;
  			
  			case right:
  				flshowline = diff != 0; /*if less then zero, In step fails and stops*/
- 				
  				break;
  			
  			case left:
  				flshowline = diff < 0;
- 				
  				break;
  			
  			case nodirection: /*following*/
  				flshowline = false;
! 				
  				break;
  			}
--- 2479,2498 ----
  				else
  					flshowline = diff < 0;
  				break;
  			
  			case right:
  				flshowline = diff != 0; /*if less then zero, In step fails and stops*/
  				break;
  			
  			case left:
  				flshowline = diff < 0;
  				break;
  			
  			case nodirection: /*following*/
  				flshowline = false;
! 				break;
! 			
! 			default:
! 				/* do nothing for up, flatup, flatdown, sorted, pageup, pagedown, pageleft, pageright */
  				break;
  			}
***************
*** 2916,2925 ****
  
  
! /*
  static boolean scripthaslinkedtextroutine (hdlheadrecord hnode) {
  	
! 	return (false); /*no linked text for script lines%/
  	} /*scripthaslinkedtextroutine*/
  
  
  static boolean optogglebreakpoint (hdlheadrecord hnode) {
--- 2917,2929 ----
  
  
! #if 0
! 
  static boolean scripthaslinkedtextroutine (hdlheadrecord hnode) {
  	
! 	return (false); /*no linked text for script lines*/
  	} /*scripthaslinkedtextroutine*/
  
+ #endif
+ 
  
  static boolean optogglebreakpoint (hdlheadrecord hnode) {
***************
*** 3054,3058 ****
  static boolean scriptsetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, scriptscraptype, &scriptdisposescrap, &scriptexportscrap));
  	} /*scriptsetscraproutine*/
  
--- 3058,3064 ----
  static boolean scriptsetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, scriptscraptype, 
! 				(shelldisposescrapcallback) &scriptdisposescrap,
! 				(shellexportscrapcallback) &scriptexportscrap));
  	} /*scriptsetscraproutine*/
  
***************
*** 3164,3172 ****
  	(**ho).doubleclickcallback = &scriptdoubleclick;
  	
! 	(**ho).setscrapcallback = &scriptsetscraproutine;
  	
! 	(**ho).getscrapcallback = &scriptgetscraproutine;
  	
! 	(**ho).texttooutlinecallback = &scripttexttooutlineroutine;
  
  	} /*scriptsetcallbacks*/
--- 3170,3178 ----
  	(**ho).doubleclickcallback = &scriptdoubleclick;
  	
! 	(**ho).setscrapcallback = (opsetscrapcallback) &scriptsetscraproutine;
  	
! 	(**ho).getscrapcallback = (opgetscrapcallback) &scriptgetscraproutine;
  	
! 	(**ho).texttooutlinecallback = (optexttooutlinecallback) &scripttexttooutlineroutine;
  
  	} /*scriptsetcallbacks*/
***************
*** 3182,3187 ****
  	
  	register hdloutlinerecord ho = houtline;
- 	WindowPtr origoutlinewindow = outlinewindow;
- 	hdlwindowinfo origoutlinewindowinfo = outlinewindowinfo;
  	hdlwindowinfo hinfo;
  	bigstring bs;
--- 3188,3191 ----
***************
*** 3317,3321 ****
  	
  	/*
! 	if (!processyieldtoagents ()) /*file closed while agents were finishing up%/
  		return (false);
  	*/
--- 3321,3325 ----
  	
  	/*
! 	if (!processyieldtoagents ()) /%file closed while agents were finishing up%/
  		return (false);
  	*/
***************
*** 3750,3754 ****
  	
  	#if flstacktrace
! 	/*** hs = langcallbacks.scripterrorstack; /*langerrorgetstack ();*/
  	
  	if (scriptinruntimestack () /*hs != nil*/ ) /*popup is stack, not language*/
--- 3754,3758 ----
  	
  	#if flstacktrace
! 	//hs = langcallbacks.scripterrorstack; /*langerrorgetstack ();*/
  	
  	if (scriptinruntimestack () /*hs != nil*/ ) /*popup is stack, not language*/
***************
*** 4104,4107 ****
--- 4108,4113 ----
  
  
+ #if 0
+ 
  static boolean opwinnewrecord (void) {
  	
***************
*** 4199,4202 ****
--- 4205,4210 ----
  	} /*opwinsavefile*/
  
+ #endif
+ 
  
  boolean scriptstart (void) {
***************
*** 4318,4322 ****
  	(*cb).gettargetdataroutine = &scriptgettargetdata;
  	
! 	(*cb).getvariableroutine = &scriptgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;
--- 4326,4330 ----
  	(*cb).gettargetdataroutine = &scriptgettargetdata;
  	
! 	(*cb).getvariableroutine = (shellgetvariablecallback) &scriptgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;

Index: services.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/services.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** services.c	23 Oct 2004 22:51:48 -0000	1.2
--- services.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 193,197 ****
  pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) {
  	
- 	boolean fltextselection = true;
  	CFMutableArrayRef copytypes, pastetypes;
  	short ix, count;
--- 193,196 ----

Index: about.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/about.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** about.c	24 Oct 2004 18:00:04 -0000	1.3
--- about.c	31 Oct 2004 13:02:23 -0000	1.4
***************
*** 459,462 ****
--- 459,464 ----
  
  
+ #if 0
+ 
  static boolean ccfindagentvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
  	
***************
*** 472,475 ****
--- 474,479 ----
  	} /*ccfindagentvisit*/
  
+ #endif
+ 
  
  static void ccdrawagentpopup (void) {
***************
*** 507,510 ****
--- 511,516 ----
  
  
+ #if 0
+ 
  static void cceraseagentpopup (void) {
  	
***************
*** 515,518 ****
--- 521,526 ----
  	} /*cceraseagentpopup*/
  
+ #endif
+ 
  
  static void ccgetmsgrect (Rect *rmsg) {
***************
*** 555,559 ****
  	
  	register hdlcancoonrecord hc = cancoonglobals;
! 	register hdlwindowinfo hw = aboutwindowinfo;
  	register hdlstring hstring;
  	register boolean flbitmap = false;
--- 563,567 ----
  	
  	register hdlcancoonrecord hc = cancoonglobals;
! 	//register hdlwindowinfo hw = aboutwindowinfo;
  	register hdlstring hstring;
  	register boolean flbitmap = false;
***************
*** 582,586 ****
  	
  	/*
! 	if (hstring == nil) /*no primary message, display file name%/
  		hstring = (**hw).hfilename;
  	*/
--- 590,594 ----
  	
  	/*
! 	if (hstring == nil) /%no primary message, display file name%/
  		hstring = (**hw).hfilename;
  	*/
***************
*** 896,900 ****
  		CGrafPtr	thePort;
  		#if TARGET_API_MAC_CARBON == 1
! 		thePort = GetWindowPort(aboutport);
  		#else
  		thePort = (CGrafPtr)aboutport;		
--- 904,908 ----
  		CGrafPtr	thePort;
  		#if TARGET_API_MAC_CARBON == 1
! 		thePort = GetWindowPort((WindowRef) aboutport);
  		#else
  		thePort = (CGrafPtr)aboutport;		
***************
*** 1216,1220 ****
  	
  
- 	hdlcancoonrecord hc = cancoonglobals;
  	hdlaboutrecord ha = aboutdata;
  	register hdlwindowinfo hw = hinfo;
--- 1224,1227 ----
***************
*** 1351,1354 ****
--- 1358,1363 ----
  
  
+ #ifndef version42orgreater
+ 
  static void drawtextitem (WindowPtr w, short item, short font, short size, short style) {
  	
***************
*** 1356,1362 ****
  	bigstring bsitem;
  	
! 	getdialogtext (w, item, bsitem);
  	
! 	dialoggetobjectrect (w, item, &ritem);
  	
  	edittextbox (bsitem, ritem, font, size, style);
--- 1365,1371 ----
  	bigstring bsitem;
  	
! 	getdialogtext ((DialogPtr) w, item, bsitem);
  	
! 	dialoggetobjectrect ((DialogPtr) w, item, &ritem);
  	
  	edittextbox (bsitem, ritem, font, size, style);
***************
*** 1369,1373 ****
  	bigstring bsscript;
  	//this is a problem. aboutwindow is a window
! 	getdialogtext (aboutwindow, urlitem, bsurl);
  	
  	if (!getsystemtablescript (idopenurlscript, bsscript))
--- 1378,1382 ----
  	bigstring bsscript;
  	//this is a problem. aboutwindow is a window
! 	getdialogtext ((DialogPtr) aboutwindow, urlitem, bsurl);
  	
  	if (!getsystemtablescript (idopenurlscript, bsscript))
***************
*** 1397,1402 ****
  
  
- #ifndef version42orgreater
- 
  #define aboutresnumber 128 /*the id of the various "about" resources*/
  
--- 1406,1409 ----

Index: frontierdebug.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/frontierdebug.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** frontierdebug.c	23 Oct 2004 22:20:26 -0000	1.2
--- frontierdebug.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 187,191 ****
  
  	#ifdef MACVERSION
! 		fprintf (logfile, "%08X (%04ld) | %04X | %s | %s\n", (unsigned long) ticks, (ticks - lastticks), idthread, category, str);
  	#endif
  
--- 187,191 ----
  
  	#ifdef MACVERSION
! 		fprintf (logfile, "%08lX (%04ld) | %08lX | %s | %s\n", (unsigned long) ticks, (ticks - lastticks), idthread, category, str);
  	#endif
  

Index: menu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu.c	23 Oct 2004 22:35:49 -0000	1.2
--- menu.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 1576,1582 ****
  	register hdlmenu h;
  	
! 	h = NewMenu (idtempmenu, (ptrstring) "\p¹"); /*name is irrelevent in a popup%/
  	
! 	if (h == nil) { /*error allocating new menu%/
  		
  		sysbeep ();
--- 1576,1582 ----
  	register hdlmenu h;
  	
! 	h = NewMenu (idtempmenu, (ptrstring) "\p¹"); /%name is irrelevent in a popup%/
  	
! 	if (h == nil) { /%error allocating new menu%/
  		
  		sysbeep ();
***************
*** 1590,1594 ****
  	
  	return (true);
! 	} /*newtempmenu*/
  	
  	
--- 1590,1595 ----
  	
  	return (true);
! 	} /%newtempmenu%/
! */
  	
  	

Index: icon.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/icon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** icon.c	23 Oct 2004 22:22:21 -0000	1.2
--- icon.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 195,199 ****
  static short ixnexticon = 0; /*keep track of which is next to load*/
  
- customiconload (bigstring bsiconname, short *resid);
  
  boolean customicongetrnum (bigstring bstype, short *rnum) {
--- 195,198 ----
***************
*** 227,231 ****
  
  
! customiconload (bigstring bsiconname, short *rnum) {
  	
  	/*
--- 226,230 ----
  
  
! static boolean customiconload (bigstring bsiconname, short *rnum) {
  	
  	/*
***************
*** 234,241 ****
  	*/
  	
- 	short customresid = 128; /*always 128 in the icon files*/
  	bigstring bsappearancefolder = "\pAppearance";
  	bigstring bsiconsfolder = "\pIcons";
- 	boolean flcreate = false;
  	OSErr err;
  	CInfoPBRec pb;
--- 233,238 ----
***************
*** 436,442 ****
  
  
  /*7.0b9 PBS: saved version that had test code for getting a bitmap from the odb.*/
  
! /*boolean ploticoncustom (const Rect *r, short align, short transform) {
  	
  	/*
--- 433,441 ----
  
  
+ #if 0
+ 
  /*7.0b9 PBS: saved version that had test code for getting a bitmap from the odb.*/
  
! boolean ploticoncustom (const Rect *r, short align, short transform) {
  	
  	/*
***************
*** 445,449 ****
  	
  
! /*#ifdef WIN95VERSION
  	HBITMAP hbm, oldbm;
  	BITMAP bm;
--- 444,448 ----
  	
  
! #ifdef WIN95VERSION
  	HBITMAP hbm, oldbm;
  	BITMAP bm;
***************
*** 554,557 ****
--- 553,558 ----
  	} /*ploticoncustom*/
  
+ #endif
+ 
  
  boolean ploticon (const Rect *r, short id) {
***************
*** 660,664 ****
  		delayticks (1);
  		}
! 	} /*drawiconsequence*/
  
  
--- 661,666 ----
  		delayticks (1);
  		}
! 	} /%drawiconsequence%/
! */
  
  
***************
*** 666,670 ****
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		bigstring bs, SInt16 depth, Boolean isColorDev) {
  		
  		/*
--- 668,672 ----
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
  		
  		/*
***************
*** 673,676 ****
--- 675,679 ----
  		
  		Rect rarrow;
+ 		//ptrstring bsptr = (ptrstring) refcon;
  		
  		setrect (&rarrow, 0, 0, 9, 9);

Index: memory.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** memory.c	23 Oct 2004 22:35:22 -0000	1.2
--- memory.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 228,232 ****
  
  
! /*
  heapmess (void) {
  	
--- 228,233 ----
  
  
! #if 0
! 
  heapmess (void) {
  	
***************
*** 244,248 ****
  		
  		ray [ixray++] = h;
! 		} /*while%/
  	
  	for (i = 0; i < ixray; i++)
--- 245,249 ----
  		
  		ray [ixray++] = h;
! 		} /*while*/
  	
  	for (i = 0; i < ixray; i++)
***************
*** 250,259 ****
  	} /*heapmess*/
  
! /*
  boolean analyzeheap (void) {
  	
  	/*
  	get some statistics about the heap.  doesn't work in 32-bit mode.
! 	%/
  	
  	register byte *pblock;
--- 251,260 ----
  	} /*heapmess*/
  
! 
  boolean analyzeheap (void) {
  	
  	/*
  	get some statistics about the heap.  doesn't work in 32-bit mode.
! 	*/
  	
  	register byte *pblock;
***************
*** 264,268 ****
  	static long avghandlesize;
  	
! 	pblock = (byte *) &(*TheZone).heapData; /*point for first block in heap zone%/
  	
  	plimit = (byte *) (*TheZone).bkLim;
--- 265,269 ----
  	static long avghandlesize;
  	
! 	pblock = (byte *) &(*TheZone).heapData; /*point for first block in heap zone*/
  	
  	plimit = (byte *) (*TheZone).bkLim;
***************
*** 270,274 ****
  	cthandles = 0;
  	
! 	ctbytes = 0; /*logical size of each handle%/
  	
  	while (pblock < plimit) {
--- 271,275 ----
  	cthandles = 0;
  	
! 	ctbytes = 0; /*logical size of each handle*/
  	
  	while (pblock < plimit) {
***************
*** 276,284 ****
  		size = *(long *)pblock & 0x00ffffff;
  		
! 		if (*pblock & 0x80) { /*a relocateable block%/
  			
! 			ctbytes += size; /*add physical size%/
  			
! 			/*ctbytes -= 8 + (*pblock & 0x0f); /*subtract header & size correction%/
  			
  			++cthandles;
--- 277,285 ----
  		size = *(long *)pblock & 0x00ffffff;
  		
! 		if (*pblock & 0x80) { /*a relocateable block*/
  			
! 			ctbytes += size; /*add physical size*/
  			
! 			//ctbytes -= 8 + (*pblock & 0x0f); /*subtract header & size correction*/
  			
  			++cthandles;
***************
*** 291,294 ****
--- 292,297 ----
  	} /*analyzeheap*/
  
+ #endif
+ 
  
  boolean haveheapspace (long size) {
***************
*** 557,563 ****
  	if (ctloops > 0) {
  	
! 		ps = (ptrbyte) psource + length - 1; /*right edge of source+/
  	
! 		pd = (ptrbyte) pdest + length - 1; /*right edge of destination+/
  	
  		while (ctloops--) 
--- 560,566 ----
  	if (ctloops > 0) {
  	
! 		ps = (ptrbyte) psource + length - 1; /%right edge of source%/
  	
! 		pd = (ptrbyte) pdest + length - 1; /%right edge of destination%/
  	
  		while (ctloops--) 
***************
*** 854,861 ****
  	register long ctorig = gethandlesize (h);
  	
! 	if (h == nil) /*defensive driving%/
  		return (false);
  	
! 	ctgrab >>= 1; /*cut in half%/
  	
  	if (ctgrab > ctorig) {
--- 857,864 ----
  	register long ctorig = gethandlesize (h);
  	
! 	if (h == nil) /%defensive driving%/
  		return (false);
  	
! 	ctgrab >>= 1; /%cut in half%/
  	
  	if (ctgrab > ctorig) {
***************
*** 1187,1191 ****
  	*/
  	
- 	Handle h = hgrow;
  	unsigned long origsize;
  	
--- 1190,1193 ----
***************
*** 1360,1364 ****
  
  
! /*
  boolean pushindentedline (short level, bigstring bs, Handle htext) {
  	
--- 1362,1367 ----
  
  
! #if 0
! 
  boolean pushindentedline (short level, bigstring bs, Handle htext) {
  	
***************
*** 1368,1382 ****
  	
  	return false if it failed, we dispose of htext if it failed.
! 	%/
  	
  	bigstring bsoutput;
  	
! 	filledstring (chtab, level, bsoutput); /*put out leading tabs%/
  	
! 	pushstring (bs, bsoutput); /*put out the string itself%/
  	
! 	pushchar (chreturn, bsoutput); /*put out a terminating carriage return character%/
  	
! 	if (!pushtexthandle (bsoutput, htext)) { /*out of memory%/
  	
  		disposehandle (htext);
--- 1371,1385 ----
  	
  	return false if it failed, we dispose of htext if it failed.
! 	*/
  	
  	bigstring bsoutput;
  	
! 	filledstring (chtab, level, bsoutput); /*put out leading tabs*/
  	
! 	pushstring (bs, bsoutput); /*put out the string itself*/
  	
! 	pushchar (chreturn, bsoutput); /*put out a terminating carriage return character*/
  	
! 	if (!pushtexthandle (bsoutput, htext)) { /*out of memory*/
  	
  		disposehandle (htext);
***************
*** 1387,1390 ****
--- 1390,1395 ----
  	return (true);
  	} /*pushindentedline*/
+ 
+ #endif
  	   
  
***************
*** 1417,1423 ****
  
  /*
! boolean concatheapstrings (h1, h2, hreturned) hdlstring *h1, *h2, *hreturned; {
  
! 	/*
  	given two heap strings, return a heap string that's the result of 
  	concatenating the two strings.
--- 1422,1428 ----
  
  /*
! boolean concatheapstrings (hdlstring *h1, hdlstring *h2, hdlstring *hreturned) {
  
! 	/%
  	given two heap strings, return a heap string that's the result of 
  	concatenating the two strings.
***************
*** 1453,1457 ****
  		
  	return (newheapstring (bs, hreturned));
! 	} /*concatheapstrings%/
  */
  
--- 1458,1462 ----
  		
  	return (newheapstring (bs, hreturned));
! 	} /%concatheapstrings%/
  */
  

Index: main.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	23 Oct 2004 22:34:57 -0000	1.2
--- main.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 32,41 ****
  #include "frontierstart.h"
  
! void main (void) {
  	
  	boolean fl;
  	
  	if (!shellinit ())
! 		return;
  	
  	grabthreadglobals ();
--- 32,41 ----
  #include "frontierstart.h"
  
! int main (void) {
  	
  	boolean fl;
  	
  	if (!shellinit ())
! 		return (1);
  	
  	grabthreadglobals ();
***************
*** 47,50 ****
--- 47,52 ----
  	if (fl)
  		shellmaineventloop ();
+ 	
+ 	return (0);
  	} /*mainstart*/
  

[frontierkernel-commits] Frontier/Common/IOAToolkit ioapopup.c,1.3,1.4

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

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

Modified Files:
	ioapopup.c 
Log Message:
Fix GCC compiler warning about disposehandle: Don't use local implementation when compiling Frontier because it's already defined in memory.h.

Index: ioapopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapopup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ioapopup.c	29 Oct 2004 20:22:01 -0000	1.3
--- ioapopup.c	31 Oct 2004 11:58:27 -0000	1.4
***************
*** 147,154 ****
  
  
! static void disposehandle (Handle h) {
  	
  	if (h != nil) DisposeHandle (h);
  	} /*disposehandle*/
  	
  	
--- 147,158 ----
  
  
! #ifndef isFrontier
! 
! static void disposehandle (Handle h) {	/* already defined in memory.c when compiling Frontier */
  	
  	if (h != nil) DisposeHandle (h);
  	} /*disposehandle*/
+ 
+ #endif
  	
  	

[frontierkernel-commits] Frontier/build_XCode/Frontier.xcode project.pbxproj,1.10,1.11

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

Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31084

Modified Files:
	project.pbxproj 
Log Message:
Added -Wno-long-double flag to build settings in order to disable warnings about the size of long doubles.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** project.pbxproj	29 Oct 2004 19:13:54 -0000	1.10
--- project.pbxproj	30 Oct 2004 23:51:42 -0000	1.11
***************
*** 638,642 ****
  				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
  				SECTORDER_FLAGS = "";
! 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
  			};
  			dependencies = (
--- 638,642 ----
  				REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
  				SECTORDER_FLAGS = "";
! 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -Wno-long-double";
  			};
  			dependencies = (

[frontierkernel-commits] Frontier/Common/source cursor.c,1.2,1.3

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

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

Modified Files:
	cursor.c 
Log Message:
Fix GCC compiler warnings.

Index: cursor.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cursor.c	23 Oct 2004 22:15:33 -0000	1.2
--- cursor.c	30 Oct 2004 23:50:28 -0000	1.3
***************
*** 248,252 ****
  	
  	ticklastroll = gettickcount ();
! 	} /*initearth%/
  
  
--- 248,252 ----
  	
  	ticklastroll = gettickcount ();
! 	} /%initearth%/
  
  
***************
*** 259,263 ****
  		state = earthstate + 1; 
  		
! 		if (state > cursorisearth7) /*wrap around%/
  			state = cursorisearth1;
  						
--- 259,263 ----
  		state = earthstate + 1; 
  		
! 		if (state > cursorisearth7) /%wrap around%/
  			state = cursorisearth1;
  						
***************
*** 266,270 ****
  		earthstate = state;
  		}
! 	} /*rollearth%/
  */
  
--- 266,270 ----
  		earthstate = state;
  		}
! 	} /%rollearth%/
  */
  

[frontierkernel-commits] Frontier/Common/headers ops.h,1.1,1.2

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

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

Modified Files:
	ops.h 
Log Message:
Fix GCC compiler warnings.

Index: ops.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/ops.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ops.h	9 Oct 2004 21:02:47 -0000	1.1
--- ops.h	30 Oct 2004 23:50:16 -0000	1.2
***************
*** 97,101 ****
  extern boolean listunlink (hdllinkedlist, hdllinkedlist);
  
! #if __powerc
  
  extern void safex80told (const extended80 *x80, long double *x);
--- 97,101 ----
  extern boolean listunlink (hdllinkedlist, hdllinkedlist);
  
! #if __powerc || __GNUC__
  
  extern void safex80told (const extended80 *x80, long double *x);

[frontierkernel-commits] Frontier/Common/source langdll.c,1.2,1.3

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

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

Modified Files:
	langdll.c 
Log Message:
Fix GCC compiler warnings.

Index: langdll.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langdll.c	23 Oct 2004 22:24:05 -0000	1.2
--- langdll.c	30 Oct 2004 23:15:04 -0000	1.3
***************
*** 358,362 ****
  	odbBool res;
  	hdllistrecord hlist;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  
  	res = false;
--- 358,361 ----
***************
*** 387,391 ****
  odbBool xCALLBACK extOdbGetListCount (odbRef odb, odbValueRecord *value, long * cnt) {
  	odbBool res;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  
  	res = false;
--- 386,389 ----
***************
*** 407,411 ****
  odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *value, long index, char * recordname) {
  	odbBool res;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  
  	res = false;
--- 405,408 ----
***************
*** 425,429 ****
  odbBool xCALLBACK extOdbSetListValue (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueData) {
  	odbBool res;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  	tyvaluerecord val;
  
--- 422,425 ----
***************
*** 447,451 ****
  odbBool xCALLBACK extOdbGetListValue (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueReturn) {
  	odbBool res;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  	tyvaluerecord valret;
  
--- 443,446 ----
***************
*** 469,473 ****
  odbBool xCALLBACK extOdbAddListValue (odbRef odb, odbValueRecord *value, char * recordname, odbValueRecord *valueData) {
  	odbBool res;
- 	hdlcancoonrecord hc = (hdlcancoonrecord) odb;
  	tyvaluerecord val;
  
--- 464,467 ----
***************
*** 1081,1085 ****
  			hnext = (**h).hashlink;
  
! 			disposehandle (h);
  			
  			h = hnext;
--- 1075,1079 ----
  			hnext = (**h).hashlink;
  
! 			disposehandle ((Handle) h);
  			
  			h = hnext;
***************
*** 1559,1567 ****
  #ifdef MACVERSION
  
! 	lockhandle (hdll);
  	
  	CloseConnection (&(**hdll).hdllsyshandle);
  	
! 	unlockhandle (hdll);
  
  #endif
--- 1553,1561 ----
  #ifdef MACVERSION
  
! 	lockhandle ((Handle) hdll);
  	
  	CloseConnection (&(**hdll).hdllsyshandle);
  	
! 	unlockhandle ((Handle) hdll);
  
  #endif
***************
*** 1635,1639 ****
  	long kmax = (**hprocinfo).ctparams;
  	long k;
- 	boolean flresult = false;
  	
  	if (!langcheckparamcount (hp1, (short) ((**hprocinfo).ctparams + 2)))
--- 1629,1632 ----
***************
*** 1756,1760 ****
  	fillcalltable (&calltable);
  
! 	lockhandle (hprocinfo); /* just to be sure our data doesn't move around */
  
  	/* If procaddress is undefined, look it up now and save it for future reference */
--- 1749,1753 ----
  	fillcalltable (&calltable);
  
! 	lockhandle ((Handle) hprocinfo); /* just to be sure our data doesn't move around */
  
  	/* If procaddress is undefined, look it up now and save it for future reference */
***************
*** 1818,1822 ****
  exit:
  
! 	unlockhandle (hprocinfo);
  		
  	return (fl);
--- 1811,1815 ----
  exit:
  
! 	unlockhandle ((Handle) hprocinfo);
  		
  	return (fl);
***************
*** 1840,1844 ****
  	/* Set up the paramblock for the call and save the original param handles */
  	
! 	fl = initparamblock (hparam1, hprocinfo, &dllparamblock, &orighandles);
  	
  	if (fl) {
--- 1833,1837 ----
  	/* Set up the paramblock for the call and save the original param handles */
  	
! 	fl = initparamblock (hparam1, hprocinfo, &dllparamblock, orighandles);
  	
  	if (fl) {
***************
*** 1850,1854 ****
  		/* Restore original param handles and free heap-allocated params */
  	
! 		freeparamblock (hprocinfo, &orighandles);
  		}
  
--- 1843,1847 ----
  		/* Restore original param handles and free heap-allocated params */
  	
! 		freeparamblock (hprocinfo, orighandles);
  		}
  
***************
*** 1920,1924 ****
  	/* Dispose proc info here because we didn't ask for the hash table to be built */
  	
! 	disposehandle (hprocinfo);
  
  	/* Unload the DLL */
--- 1913,1917 ----
  	/* Dispose proc info here because we didn't ask for the hash table to be built */
  	
! 	disposehandle ((Handle) hprocinfo);
  
  	/* Unload the DLL */

[frontierkernel-commits] Frontier/Common/source langevaluate.c,1.2,1.3

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

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

Modified Files:
	langevaluate.c 
Log Message:
Fix GCC compiler warnings.

Index: langevaluate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langevaluate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langevaluate.c	23 Oct 2004 22:24:51 -0000	1.2
--- langevaluate.c	30 Oct 2004 23:11:36 -0000	1.3
***************
*** 769,773 ****
  static boolean addmodulecontext (hdlhashtable htable, hdlhashnode hnode, bigstring bsname, hdltreenode htree) {
  	
! 	/*
  	add all of the top-level locals and modules to the current context
  	%/
--- 769,773 ----
  static boolean addmodulecontext (hdlhashtable htable, hdlhashnode hnode, bigstring bsname, hdltreenode htree) {
  	
! 	/%
  	add all of the top-level locals and modules to the current context
  	%/
***************
*** 800,804 ****
  	
  	return (fl);
! 	} /*addmodulecontext*/
  
  
--- 800,805 ----
  	
  	return (fl);
! 	} /%addmodulecontext%/
! */
  
  
***************
*** 905,909 ****
  			
  			/*
! 			if (langexternalvaltocode (valtable, &hcode)) { /*5/14/93 dmb%/
  				
  				if (!hashtablelookupnode (htable, bs, &hnode))
--- 906,910 ----
  			
  			/*
! 			if (langexternalvaltocode (valtable, &hcode)) { /%5/14/93 dmb%/
  				
  				if (!hashtablelookupnode (htable, bs, &hnode))
***************
*** 1348,1352 ****
  	*/
  	
! 	register hdlerrorstack hs = langcallbacks.scripterrorstack;
  	
  	if ((**hp).link != nil)
--- 1349,1353 ----
  	*/
  	
! 	//register hdlerrorstack hs = langcallbacks.scripterrorstack;
  	
  	if ((**hp).link != nil)
***************
*** 1744,1748 ****
  		case breakop:
  			/*
! 			if (!langdebuggercall (h)) /*user killed the script%/
  				return (false);
  			*/
--- 1745,1749 ----
  		case breakop:
  			/*
! 			if (!langdebuggercall (h)) /%user killed the script%/
  				return (false);
  			*/
***************
*** 1762,1766 ****
  		case returnop:
  			/*
! 			if (!langdebuggercall (h)) /*user killed the script%/
  				return (false);
  			*/
--- 1763,1767 ----
  		case returnop:
  			/*
! 			if (!langdebuggercall (h)) /%user killed the script%/
  				return (false);
  			*/
***************
*** 1879,1882 ****
--- 1880,1886 ----
  		#endif
  		
+ 		default:
+ 			/* do nothing for procop, assignlocalop, caseitemop, casebodyop, kernelop, globalop */
+ 			break;
  		} /*switch*/
  	
***************
*** 1903,1907 ****
  
  
! static int ctdeferredthis = 0;
  
  boolean evaluatelist (hdltreenode hfirst, tyvaluerecord *val) {
--- 1907,1913 ----
  
  
! #if lazythis_optimization
! 	static int ctdeferredthis = 0;
! #endif
  
  boolean evaluatelist (hdltreenode hfirst, tyvaluerecord *val) {

[frontierkernel-commits] Frontier/Common/source dialogs.c,1.3,1.4

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

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

Modified Files:
	dialogs.c 
Log Message:
Fix GCC compiler warnings.

Index: dialogs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dialogs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialogs.c	24 Oct 2004 16:14:45 -0000	1.3
--- dialogs.c	30 Oct 2004 23:07:30 -0000	1.4
***************
*** 62,75 ****
  	//switched to use CountDITL. This has been around since OS 7
  	return CountDITL(pdialog);
- 	/*
- 	amazingly we have to klooge around to find out how many items there are
- 	in a dialog's item list.
- 	*/
- 	
- 	/*register Handle h;
- 	
- 	h = (*(DialogPeek) pdialog).items;
- 	
- 	return ((**(short **) h) + 1); /*magic incantation -- Boozer says this works*/
  	} /*dialogcountitems*/
  
--- 62,65 ----
***************
*** 81,97 ****
  	//check this I need to check to see if this is a memory leak or not. 
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	DialogItemType  	itemType = 0;
!     Handle 				h;
! 	Rect 				r = {0,0,0,0};
! 	SInt16				whichField = 0;
! 	h = NewHandle(0);
  
! 	h = GetDialogTextEditHandle(pdialog);
! 	
! 	*hbuffer = h;
  	
  	#else
! 	//old code
! 	*hbuffer = (*(DialogPeek) pdialog).textH;
  	#endif
  	} /*dialoggeteditbuffer*/
--- 71,84 ----
  	//check this I need to check to see if this is a memory leak or not. 
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 		//DialogItemType  	itemType = 0;
! 		//Handle 				h;
! 		//Rect 				r = {0,0,0,0};
! 		//SInt16				whichField = 0;
  
! 		*hbuffer = GetDialogTextEditHandle((DialogRef) pdialog);
  	
  	#else
! 		//old code
! 		*hbuffer = (*(DialogPeek) pdialog).textH;
  	#endif
  	} /*dialoggeteditbuffer*/
***************
*** 360,364 ****
  	#endif
  	
! 	pdialog = GetNewDialog (id, nil, (DialogPtr) -1L);
  	
  	#ifdef flcomponent
--- 347,351 ----
  	#endif
  	
! 	pdialog = GetNewDialog (id, nil, (WindowRef) -1L);
  	
  	#ifdef flcomponent
***************
*** 406,410 ****
  	DisposeDialog (pdialog);
  	
! 	#if 0 /*ndef flruntime/
  	
  		/*handle all pending activate & update events*/
--- 393,397 ----
  	DisposeDialog (pdialog);
  	
! 	#if 0 //ndef flruntime
  	
  		/*handle all pending activate & update events*/
***************
*** 998,1005 ****
   	//register short hit = 0;
   	
!  	#ifdef flcomponent
!  	
!  	long curA5 = SetUpAppA5 ();
!  	
   	#endif
   	
--- 985,990 ----
   	//register short hit = 0;
   	
!  	#if !TARGET_API_MAC_CARBON && defined(flcomponent)
! 		long curA5 = SetUpAppA5 ();
   	#endif
   	
***************
*** 1069,1077 ****
  				boldenbutton (pdialog, defaultitem);
  			#if TARGET_API_MAC_CARBON == 1
! 			{
! 			WindowRef pWindow = GetDialogWindow(pdialog);
! 			CGrafPtr thePort = GetDialogPort(pdialog);
! 			QDFlushPortBuffer(thePort, nil);	
! 			}
  			#endif
  			break;
--- 1054,1061 ----
  				boldenbutton (pdialog, defaultitem);
  			#if TARGET_API_MAC_CARBON == 1
! 				{
! 				CGrafPtr thePort = GetDialogPort(pdialog);
! 				QDFlushPortBuffer(thePort, nil);	
! 				}
  			#endif
  			break;
***************
*** 1080,1084 ****
  			
  			/*
! 			shellblockevents (); /*all events are blocked when modal dialog is in front%/
  			
  			if (flscriptrunning)
--- 1064,1068 ----
  			
  			/*
! 			shellblockevents (); /%all events are blocked when modal dialog is in front%/
  			
  			if (flscriptrunning)
***************
*** 1095,1107 ****
  			//at some points to use ModalDialog Correctly.
  			#if TARGET_API_MAC_CARBON == 1
! 			{
! 			WindowRef pWindow = GetDialogWindow(pdialog);
! 			CGrafPtr thePort = GetDialogPort(pdialog);
! 			
! 			SelectWindow(pWindow);
! 			QDFlushPortBuffer(thePort, nil);	
! 			}
  			#else
! 			SelectWindow (pdialog); /*make sure no one has screwed around with us*/
  			#endif
  			break;
--- 1079,1091 ----
  			//at some points to use ModalDialog Correctly.
  			#if TARGET_API_MAC_CARBON == 1
! 				{
! 				WindowRef pWindow = GetDialogWindow(pdialog);
! 				CGrafPtr thePort = GetDialogPort(pdialog);
! 				
! 				SelectWindow(pWindow);
! 				QDFlushPortBuffer(thePort, nil);	
! 				}
  			#else
! 				SelectWindow (pdialog); /*make sure no one has screwed around with us*/
  			#endif
  			break;
***************
*** 1109,1116 ****
  		} /*switch*/
  	
! 	#ifdef flcomponent
! 	
! 	RestoreA5 (curA5);
! 	
  	#endif
  	return (eventHandled); /*the dialog manager's version of false*/
--- 1093,1098 ----
  		} /*switch*/
  	
! 	#if !TARGET_API_MAC_CARBON && defined(flcomponent)
! 		RestoreA5 (curA5);
  	#endif
  	return (eventHandled); /*the dialog manager's version of false*/
***************
*** 1132,1140 ****
  		{
  		ProcPtr filter = (ProcPtr) modaldialogcallback;
! 		long appA5 = SetUpCurA5 (); /*for system*/
  		
  		ModalDialog ((ModalFilterUPP) filter, &itemnumber);
  		
! 		RestoreA5 (appA5);
  		}
  	#else
--- 1114,1126 ----
  		{
  		ProcPtr filter = (ProcPtr) modaldialogcallback;
! 		#if !TARGET_API_MAC_CARBON && defined(flcomponent)
! 			long appA5 = SetUpCurA5 (); /*for system*/
! 		#endif
  		
  		ModalDialog ((ModalFilterUPP) filter, &itemnumber);
  		
! 		#if !TARGET_API_MAC_CARBON && defined(flcomponent)
! 			RestoreA5 (appA5);
! 		#endif
  		}
  	#else
***************
*** 1324,1328 ****
  	#if TARGET_API_MAC_CARBON == 1
  		WindowClass 	wclass;
! 		err = GetWindowClass (pdialog, &wclass);
  		if (err==noErr) {
  			if (wclass == kModalWindowClass) {
--- 1310,1314 ----
  	#if TARGET_API_MAC_CARBON == 1
  		WindowClass 	wclass;
! 		err = GetWindowClass ((WindowRef) pdialog, &wclass);
  		if (err==noErr) {
  			if (wclass == kModalWindowClass) {
***************
*** 1332,1336 ****
  			
  				// it's not a dialog, it's an olde-tyme window. The Find window, for example.
! 				return (dialogsetselect (GetDialogFromWindow(pdialog), 0, infinity));
  			}
  			
--- 1318,1322 ----
  			
  				// it's not a dialog, it's an olde-tyme window. The Find window, for example.
! 				return (dialogsetselect (GetDialogFromWindow((WindowRef) pdialog), 0, infinity));
  			}
  			
***************
*** 1366,1370 ****
  	register short id;
  	
! 	if (bsfname == nil) /*file wasn't dirty; just want to confirm Quit%/
  		id = quitdialogid;
  	else
--- 1352,1356 ----
  	register short id;
  	
! 	if (bsfname == nil) /%file wasn't dirty; just want to confirm Quit%/
  		id = quitdialogid;
  	else

[frontierkernel-commits] Frontier/Common/source langhtml.c,1.2,1.3

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

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

Modified Files:
	langhtml.c 
Log Message:
Fix GCC compiler warnings.

Index: langhtml.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhtml.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langhtml.c	23 Oct 2004 22:25:51 -0000	1.2
--- langhtml.c	30 Oct 2004 22:46:12 -0000	1.3
***************
*** 350,354 ****
  #if version42orgreater
  
! static ptraddress callbackscript = nil;
  
  typedef struct typrocessmacrosinfo {
--- 350,354 ----
  #if version42orgreater
  
! //static ptraddress callbackscript = nil;
  
  typedef struct typrocessmacrosinfo {
***************
*** 380,384 ****
  #endif
  
! static boolean htmlcallbackerror (bigstring bsmsg, ptrstring perrorstring) {
  	
  	/*
--- 380,384 ----
  #endif
  
! static boolean htmlcallbackerror (bigstring bsmsg, ptrvoid perrorstring) {
  	
  	/*
***************
*** 388,397 ****
  	*/
  	
! 	copystring (bsmsg, perrorstring);
  	
  	return (true);
  	} /*htmlcallbackerror*/
  
! 
  #if version42orgreater
  
--- 388,397 ----
  	*/
  	
! 	copystring (bsmsg, (ptrstring) perrorstring);
  	
  	return (true);
  	} /*htmlcallbackerror*/
  
! #if 0
  #if version42orgreater
  
***************
*** 573,576 ****
--- 573,577 ----
  
  #endif
+ #endif
  
  
***************
*** 625,658 ****
  	} /*langpushwithtable*/
  
- /*
- static boolean langlookupstringvalue (hdlhashtable ht, bigstring bs, bigstring bsval) {
- 	
- 	/*
- 	a genereic piece of code: look up the string value, with errors
- 	%/
- 	
- 	tyvaluerecord val;
- 	
- 	if (!hashtablelookup (ht, bs, &val)) {
- 		
- 		langparamerror (unknownidentifiererror, bs);
- 		
- 		return (false);
- 		}
- 	
- 	/*
- 	if (!copyvaluerecord (val, &val) && coercetostring (&val))
- 		return (false);
- 	
- 	exemptfromtmpstack (&val);
- 	
- 	*value = val.data.stringvalue;
- 	%/
- 	
- 	pullstringvalue (&val, bsval);
- 	
- 	return (true);
- 	} /*langlookupstringvalue*/
- 
  
  static boolean htmlgetdefaultpagetable (hdlhashtable *hpagetable) {
--- 626,629 ----
***************
*** 663,667 ****
  	
  	return (langfastaddresstotable (roottable, str_websitesdata, hpagetable));
! 	} /*htmlgetpagetable*/
  
  
--- 634,638 ----
  	
  	return (langfastaddresstotable (roottable, str_websitesdata, hpagetable));
! 	} /*htmlgetdefaultpagetable*/
  
  
***************
*** 684,687 ****
--- 655,660 ----
  
  
+ #if 0
+ 
  static boolean htmlgetpagetable (hdlhashtable *hpagetable) {
  	
***************
*** 712,715 ****
--- 685,690 ----
  	} /*htmlgetpagetable*/
  
+ #endif
+ 
  		
  static boolean htmlgetprefstable (hdlhashtable *huserprefs) {
***************
*** 1281,1284 ****
--- 1256,1261 ----
  
  
+ #if 0
+ 
  static boolean isPunctuationChar (char ch) {
  	
***************
*** 1293,1296 ****
--- 1270,1275 ----
  	return (false);
  	} /*isPunctuationChar*/
+ 
+ #endif
  	
  
***************
*** 2103,2108 ****
  				}
  				
! 			/* 4.1b12 dmb: these don't have html charactors equivalents, but we can do the mapping in the open-architecture isofilter
! 			
  			case 'Õ': case 'Ô':
  				(*h) [i] = '\'';
--- 2082,2087 ----
  				}
  				
! 			/* 4.1b12 dmb: these don't have html charactors equivalents, but we can do the mapping in the open-architecture isofilter */
! 			/*
  			case 'Õ': case 'Ô':
  				(*h) [i] = '\'';
***************
*** 2143,2149 ****
  				
  				break;
! 			
! 			/* 4.1b5 dmb: all of the following are html charactors and have iso8859 mappings
! 			
  			case 'Ê': // a funny space that Word produces
  				(*h) [i] = ' ';
--- 2122,2128 ----
  				
  				break;
! 			*/
! 			/* 4.1b5 dmb: all of the following are html charactors and have iso8859 mappings */
! 			/*
  			case 'Ê': // a funny space that Word produces
  				(*h) [i] = ' ';
***************
*** 2217,2221 ****
  	Handle h = (*s).data;
  	unsigned long remainingchars;
- 	unsigned long pgfcount = 0;
  	char ch;
  	boolean flinsidetag = false;
--- 2196,2199 ----
***************
*** 2756,2760 ****
  		Handle htext, hreturnedtext = nil, hfieldname, hfieldvalue;
  		hdllistrecord list = nil;
! 		short fieldnum = 1, ixlist = 1;
  		long lenfield, lenfieldname;
  
--- 2734,2738 ----
  		Handle htext, hreturnedtext = nil, hfieldname, hfieldvalue;
  		hdllistrecord list = nil;
! 		short fieldnum = 1;
  		long lenfield, lenfieldname;
  
***************
*** 3484,3488 ****
  
  
! /*
  static boolean refglossaryverb (hdltreenode hp1, tyvaluerecord *v) {
  	
--- 3462,3467 ----
  
  
! #if 0
! 
  static boolean refglossaryverb (hdltreenode hp1, tyvaluerecord *v) {
  	
***************
*** 3496,3500 ****
  	*/
  	
! 	/*typrocessmacrosinfo pageinfo;
  	Handle href, hresult;
  	bigstring errorstring;
--- 3475,3479 ----
  	*/
  	
! 	typrocessmacrosinfo pageinfo;
  	Handle href, hresult;
  	bigstring errorstring;
***************
*** 3509,3512 ****
--- 3488,3493 ----
  	} /*refglossaryverb*/
  
+ #endif
+ 
  
  #ifdef MACVERSION
***************
*** 3537,3587 ****
  
  
! /*
  static boolean getonedirectiveverb (hdltreenode hp1, tyvaluerecord *v) {
  	
  	/*
! on getOneDirective (directiveName, s) { Çnew in 4.0.1
! 	ÇRevised for ContentServer.
! 		ÇFriday, March 13, 1998 at 9:47:37 PM by PBS
! 		ÇNow case-insensitive.
! 		ÇRespects directivesOnlyAtBeginning pref.
! 	ÇOld code
! 		Çlocal (ix = string.patternMatch (string.lower (directivename), string.lower (s)))
! 		Çif ix > 0
! 			Çs = string.delete (s, 1, ix + sizeof (directivename))
! 			Çs = string.delete (s, string.patternmatch (cr, s), infinity)
! 			Çreturn (evaluate (s))
! 		Çelse
! 			Çreturn ("")
! 	local (value = "");
! 	local (flDirectivesOnlyAtBeginning = html.getPref ("directivesOnlyAtBeginning"));
! 	if typeOf (s) == outlineType {
! 		flDirectivesOnlyAtBeginning = false};
! 	table.assign (@s, string.replaceAll (string (s), "\n", ""));
! 	if directiveName beginsWith "#" { //pop off leading # character
! 		directiveName = string.mid (directiveName, 2, infinity)};
! 	loop { //loop through directives
! 		if sizeof (s) == 0 {
! 			break};
! 		local (line = string.nthField (s, "\r", 1));
! 		if line beginsWith "#" {
! 			local (name);
! 			name = string.nthField (line, ' ', 1); //get the name of the directive
! 			name = string.mid (name, 2, infinity); //pop off leading # character
! 			if string.lower (name) == string.lower (directiveName) { //is this the directive asked for?
! 				local (ix = string.patternMatch (" ", line));
! 				value = string.mid (line, ix + 1, infinity);
! 				return (evaluate (value))}}
! 		else {
! 			if flDirectivesOnlyAtBeginning {
  				break}};
! 		s = string.delete (s, 1, sizeof (line) + 1);
! 		if sizeOf (s) < 3 {
! 			break}};
! 	return (value)}
! 	* /
  	
  	} /*getonedirectiveverb*/
  
  
  static boolean htmlrundirective (typrocessmacrosinfo *pmi, Handle s, bigstring fieldname) {
--- 3518,3571 ----
  
  
! #if 0
! 
  static boolean getonedirectiveverb (hdltreenode hp1, tyvaluerecord *v) {
  	
  	/*
! 	on getOneDirective (directiveName, s) { Çnew in 4.0.1
! 		ÇRevised for ContentServer.
! 			ÇFriday, March 13, 1998 at 9:47:37 PM by PBS
! 			ÇNow case-insensitive.
! 			ÇRespects directivesOnlyAtBeginning pref.
! 		ÇOld code
! 			Çlocal (ix = string.patternMatch (string.lower (directivename), string.lower (s)))
! 			Çif ix > 0
! 				Çs = string.delete (s, 1, ix + sizeof (directivename))
! 				Çs = string.delete (s, string.patternmatch (cr, s), infinity)
! 				Çreturn (evaluate (s))
! 			Çelse
! 				Çreturn ("")
! 		local (value = "");
! 		local (flDirectivesOnlyAtBeginning = html.getPref ("directivesOnlyAtBeginning"));
! 		if typeOf (s) == outlineType {
! 			flDirectivesOnlyAtBeginning = false};
! 		table.assign (@s, string.replaceAll (string (s), "\n", ""));
! 		if directiveName beginsWith "#" { //pop off leading # character
! 			directiveName = string.mid (directiveName, 2, infinity)};
! 		loop { //loop through directives
! 			if sizeof (s) == 0 {
! 				break};
! 			local (line = string.nthField (s, "\r", 1));
! 			if line beginsWith "#" {
! 				local (name);
! 				name = string.nthField (line, ' ', 1); //get the name of the directive
! 				name = string.mid (name, 2, infinity); //pop off leading # character
! 				if string.lower (name) == string.lower (directiveName) { //is this the directive asked for?
! 					local (ix = string.patternMatch (" ", line));
! 					value = string.mid (line, ix + 1, infinity);
! 					return (evaluate (value))}}
! 			else {
! 				if flDirectivesOnlyAtBeginning {
! 					break}};
! 			s = string.delete (s, 1, sizeof (line) + 1);
! 			if sizeOf (s) < 3 {
  				break}};
! 		return (value)}
! 	*/
  	
  	} /*getonedirectiveverb*/
  
+ #endif
+ 
  
  static boolean htmlrundirective (typrocessmacrosinfo *pmi, Handle s, bigstring fieldname) {
***************
*** 3978,4036 ****
  
  
! /*static boolean normalizenameverb (hdltreenode hp1, tyvaluerecord *v) {
  
  	/*
! on normalizeName (name, pageTable=nil, adrObject=nil) {
! 	Ç2/12/98 at 3:26:44 PM by PBS
! 		ÇSupport for normalizing folder names.
! 		ÇURL-encode returned name.
! 		ÇSupport for normalizing a name that isn't the page being generated.
! 	Ç4/13/98 PBS
! 		ÇThere are three contexts in which this operates:
! 			Ç1) Normalizing a name of a new page that has no prefs.
! 			Ç2) Normalizing a name based on the prefs of the page being rendered.
! 			Ç3) Normalizing a name based on the prefs of a remote page.
! 	
! 	local (flDropNonAlphas, flLowerCaseFileNames);
! 	local (maxLength);
! 	local (extension = "");
! 	local (flFolder = false);
! 	
! 	if pageTable == nil and adrObject == nil { //it's a new page without prefs
! 		flDropNonAlphas = html.getPref ("dropNonAlphas");
! 		flLowerCaseFileNames = html.getPref ("lowerCaseFileNames");
! 		maxLength = number (html.getPref ("maxFileNameLength"));
! 		extension = html.getPref ("fileExtension")}
! 	else { //it's an existing page with prefs
! 		if pageTable == nil {
! 			pageTable = @websites.["#data"]};
! 		if adrObject == nil {
! 			adrObject = pageTable^.adrObject};
! 		if adrObject == pageTable^.adrObject { //it's the current page
! 			flDropNonAlphas = html.getPref ("dropNonAlphas", pageTable);
! 			flLowerCaseFileNames = html.getPref ("lowerCaseFileNames", pageTable);
! 			maxLength = number (html.getPref ("maxFileNameLength", pageTable));
! 			extension = html.getPref ("fileExtension", pageTable)}
! 		else { //it's a remote page
! 			flDropNonAlphas = html.getPagePref ("dropNonAlphas", adrObject, pageTable);
! 			flLowerCaseFileNames = html.getPagePref ("lowerCaseFileNames", adrObject, pageTable);
! 			maxLength = number (html.getPagePref ("maxFileNameLength", adrObject, pageTable));
! 			extension = html.getPagePref ("fileExtension", adrObject, pageTable)};
! 		if typeOf (adrObject^) == tableType {
! 			flFolder = true}};
  	
- 	if flDropNonAlphas {
- 		name = string.dropNonAlphas (name)};
- 	if flLowerCaseFileNames {
- 		name = string.lower (name)};
- 	if flFolder {
- 		extension = ""};
- 	maxLength = maxLength - sizeOf (extension);
- 	if sizeof (name) > maxLength {
- 		name = string.mid (name, 1, maxLength)};
- 	return (name)}
- 	* /
  	} /*normalizenameverb*/
  
  
  static boolean glossarypatcherverb (hdltreenode hp1, tyvaluerecord *v) {
--- 3962,4025 ----
  
  
! #if 0
! 
! static boolean normalizenameverb (hdltreenode hp1, tyvaluerecord *v) {
  
  	/*
! 	on normalizeName (name, pageTable=nil, adrObject=nil) {
! 		Ç2/12/98 at 3:26:44 PM by PBS
! 			ÇSupport for normalizing folder names.
! 			ÇURL-encode returned name.
! 			ÇSupport for normalizing a name that isn't the page being generated.
! 		Ç4/13/98 PBS
! 			ÇThere are three contexts in which this operates:
! 				Ç1) Normalizing a name of a new page that has no prefs.
! 				Ç2) Normalizing a name based on the prefs of the page being rendered.
! 				Ç3) Normalizing a name based on the prefs of a remote page.
! 		
! 		local (flDropNonAlphas, flLowerCaseFileNames);
! 		local (maxLength);
! 		local (extension = "");
! 		local (flFolder = false);
! 		
! 		if pageTable == nil and adrObject == nil { //it's a new page without prefs
! 			flDropNonAlphas = html.getPref ("dropNonAlphas");
! 			flLowerCaseFileNames = html.getPref ("lowerCaseFileNames");
! 			maxLength = number (html.getPref ("maxFileNameLength"));
! 			extension = html.getPref ("fileExtension")}
! 		else { //it's an existing page with prefs
! 			if pageTable == nil {
! 				pageTable = @websites.["#data"]};
! 			if adrObject == nil {
! 				adrObject = pageTable^.adrObject};
! 			if adrObject == pageTable^.adrObject { //it's the current page
! 				flDropNonAlphas = html.getPref ("dropNonAlphas", pageTable);
! 				flLowerCaseFileNames = html.getPref ("lowerCaseFileNames", pageTable);
! 				maxLength = number (html.getPref ("maxFileNameLength", pageTable));
! 				extension = html.getPref ("fileExtension", pageTable)}
! 			else { //it's a remote page
! 				flDropNonAlphas = html.getPagePref ("dropNonAlphas", adrObject, pageTable);
! 				flLowerCaseFileNames = html.getPagePref ("lowerCaseFileNames", adrObject, pageTable);
! 				maxLength = number (html.getPagePref ("maxFileNameLength", adrObject, pageTable));
! 				extension = html.getPagePref ("fileExtension", adrObject, pageTable)};
! 			if typeOf (adrObject^) == tableType {
! 				flFolder = true}};
! 		
! 		if flDropNonAlphas {
! 			name = string.dropNonAlphas (name)};
! 		if flLowerCaseFileNames {
! 			name = string.lower (name)};
! 		if flFolder {
! 			extension = ""};
! 		maxLength = maxLength - sizeOf (extension);
! 		if sizeof (name) > maxLength {
! 			name = string.mid (name, 1, maxLength)};
! 		return (name)}
! 	*/
  	
  	} /*normalizenameverb*/
  
+ #endif
+ 
  
  static boolean glossarypatcherverb (hdltreenode hp1, tyvaluerecord *v) {
***************
*** 5078,5082 ****
  	hdltreenode hscriptcode;
  	tyvaluerecord vhandler;
- 	Handle hthread = nil;
  	hdlhashnode handlernode;
  		
--- 5067,5070 ----
***************
*** 5900,5903 ****
--- 5888,5893 ----
  */
  
+ #if 0
+ 
  static boolean webservergetpref (bigstring bsprefname, tyvaluerecord *vreturn) {
  	
***************
*** 5933,5937 ****
  	return (true);
  	} /*webservergetpref*/
! 	
  
  
--- 5923,5928 ----
  	return (true);
  	} /*webservergetpref*/
! 
! #endif
  
  
***************
*** 6104,6108 ****
  		if (coercetoboolean (&v) && v.data.flvalue) { /* found it */
  				
! 			/*gethashkey (hnode, bs); /*7.0.1 PBS: commented out. We may have resolved one or more addresses.*/
  
  			copystring (bskey, bs); /*7.0.1 PBS: use the key we got before resolving addresses.*/
--- 6095,6099 ----
  		if (coercetoboolean (&v) && v.data.flvalue) { /* found it */
  				
! 			//gethashkey (hnode, bs); /*7.0.1 PBS: commented out. We may have resolved one or more addresses.*/
  
  			copystring (bskey, bs); /*7.0.1 PBS: use the key we got before resolving addresses.*/
***************
*** 6703,6709 ****
  	/* Check for Expect header -- we may not be able to live up to the client's expectations */
  
! /*	if (hashtablesymbolexists (hheaderstable, STR_P_EXPECT)) { /*PBS 7.0b43: handle before reading body*/
  	
! /*		*errorcode = 417;
  		
  		flresult = true;
--- 6694,6700 ----
  	/* Check for Expect header -- we may not be able to live up to the client's expectations */
  
! /*	if (hashtablesymbolexists (hheaderstable, STR_P_EXPECT)) { /% PBS 7.0b43: handle before reading body %/
  	
! 		*errorcode = 417;
  		
  		flresult = true;
***************
*** 7201,7205 ****
  
  	hdlhashtable hparenttable, hlogtable;
- 	hdllistrecord hparamlist = nil;
  	tyvaluerecord vlogtable;
  	bigstring bstablename;
--- 7192,7195 ----
***************
*** 7717,7723 ****
  
  
! static boolean findfirstnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, hdlhashnode *hnode) {
! 	
  	if (isallnumeric (bsname)) {
  		
  		*hnode = nomad;
--- 7707,7715 ----
  
  
! static boolean findfirstnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, ptrvoid refcon) {
! 
  	if (isallnumeric (bsname)) {
+ 
+ 		hdlhashnode *hnode = (hdlhashnode *) refcon;
  		
  		*hnode = nomad;
***************
*** 7854,7862 ****
  */
  
! static boolean findlastnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, hdlhashnode *hnode) {
  	
- 	if (isallnumeric (bsname))
  		*hnode = nomad;
! 
  	return (false);
  	}/*findlastnumericnodevisit*/
--- 7846,7858 ----
  */
  
! static boolean findlastnumericnodevisit (bigstring bsname, hdlhashnode nomad, tyvaluerecord val, ptrvoid refcon) {
! 	
! 	if (isallnumeric (bsname)) {
! 	
! 		hdlhashnode *hnode = (hdlhashnode *) refcon;
  	
  		*hnode = nomad;
! 		}
! 		
  	return (false);
  	}/*findlastnumericnodevisit*/
***************
*** 8436,8439 ****
--- 8432,8437 ----
  #define columntodayofweek(i,f) ((((i) + ((f) - 1) - 1) % 7) + 1)
  
+ #if 0
+ 
  static boolean addhandle (handlestream *s, Handle h, short cttabs) {
  
***************
*** 8473,8476 ****
--- 8471,8476 ----
  	}/*addstring*/
  
+ #endif
+ 
  
  static boolean addclassattribute (handlestream *s, Handle hcssprefix, bigstring bsname) {
***************
*** 8535,8539 ****
  
  	Handle hlink= nil;
- 	Handle hurl = nil;
  	bigstring daystring;
  	bigstring paddeddaystring;
--- 8535,8538 ----
***************
*** 9424,9429 ****
  static boolean issafeunaryop (hdltreenode hnode, hdlhashtable hmacrostable);
  
- static boolean issafebracketop (hdltreenode hnode, hdlhashtable hmacrostable);
- 
  static boolean issafearrayop (hdltreenode hnode, hdlhashtable hmacrostable);
  
--- 9423,9426 ----
***************
*** 9818,9824 ****
  		case noop:
  			return (true); /*noop's are very agreeable*/
  		}/*switch*/
  		
- 	return (false);
  	}/*issafestatement*/
  	
--- 9815,9823 ----
  		case noop:
  			return (true); /*noop's are very agreeable*/
+ 		
+ 		default:
+ 			return (false);
  		}/*switch*/
  		
  	}/*issafestatement*/
  	
***************
*** 10578,10582 ****
  		case webserverdispatchfunc: {
  			tyaddress adrparamtable;
- 			Handle hrequest = nil;
  			
  			flnextparamislast = true;
--- 10577,10580 ----

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

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

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

Modified Files:
	langregexp.c 
Log Message:
Fix GCC compiler warnings.

Index: langregexp.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langregexp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langregexp.c	23 Oct 2004 22:30:08 -0000	1.4
--- langregexp.c	30 Oct 2004 22:19:55 -0000	1.5
***************
*** 572,576 ****
  	grepfunc,
  	
! 	getpatterinfofunc,
  	
  	expandfunc,
--- 572,576 ----
  	grepfunc,
  	
! 	getpatterninfofunc,
  	
  	expandfunc,
***************
*** 703,710 ****
  typedef boolean (*tyreplscannamedcallback) (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon);
  
! typedef boolean (*tyreplscanbadgroupnamecallback) (int pos, bigstring bsmsg);
  
  
! static const unsigned char *chartableptr = nil;
  
  
--- 703,710 ----
  typedef boolean (*tyreplscannamedcallback) (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon);
  
! typedef void (*tyreplscanbadgroupnamecallback) (int pos, bigstring bsmsg);
  
  
! static unsigned char *chartableptr = nil;
  
  
***************
*** 910,914 ****
  		}
  
! 	*hlist = vparam.data.binaryvalue;
  
  	return (true);
--- 910,914 ----
  		}
  
! 	*hlist = (hdllistrecord) vparam.data.binaryvalue;
  
  	return (true);
***************
*** 1030,1034 ****
  						subject, length, ix, matchlen,
  						getoptions (hcp) & PUBLIC_EXEC_OPTIONS,
! 						*hovector, getovectorsize (hcp), chartableptr); 
  
  	/* process execution errors here, presumably indicative of a bug in the PCRE library */
--- 1030,1034 ----
  						subject, length, ix, matchlen,
  						getoptions (hcp) & PUBLIC_EXEC_OPTIONS,
! 						(int *)*hovector, getovectorsize (hcp), chartableptr); 
  
  	/* process execution errors here, presumably indicative of a bug in the PCRE library */
***************
*** 1168,1172 ****
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = hoffsets;
  		
  		if (!hashtableassign (ht, STR_groupOffsets, vtemp))
--- 1168,1172 ----
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = (Handle) hoffsets;
  		
  		if (!hashtableassign (ht, STR_groupOffsets, vtemp))
***************
*** 1179,1183 ****
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = hlengths;
  		
  		if (!hashtableassign (ht, STR_groupLengths, vtemp))
--- 1179,1183 ----
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = (Handle) hlengths;
  		
  		if (!hashtableassign (ht, STR_groupLengths, vtemp))
***************
*** 1190,1194 ****
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = hstrings;
  		
  		if (!hashtableassign (ht, STR_groupStrings, vtemp))
--- 1190,1194 ----
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = (Handle) hstrings;
  		
  		if (!hashtableassign (ht, STR_groupStrings, vtemp))
***************
*** 1290,1303 ****
  
  
- static int regexpstringnumberfromtable (char *cptr, int len, void *refcon) {
- 
- 	hdlhashtable htmatchinfo = (hdlhashtable) refcon;
- 	
- 	
- 	
- 	return (PCRE_ERROR_NOSUBSTRING);
- 	} /*regexpstringnumberfrompattern*/
- 
- 
  static int regexpstringnumberfrompattern (const char *cptr, int len, Handle hcp) {
  	
--- 1290,1293 ----
***************
*** 1506,1510 ****
  
  
! static boolean regexptextsearchwritenamed (int ix, int len, char *cptr, int clen, bigstring bserror, void *refcon) {
  	
  	tyregexpsearchinfo *info = (tyregexpsearchinfo *) refcon;
--- 1496,1500 ----
  
  
! static boolean regexptextsearchwritenamed (int ix, int len, const char *cptr, int clen, bigstring bserror, void *refcon) {
  	
  	tyregexpsearchinfo *info = (tyregexpsearchinfo *) refcon;
***************
*** 1530,1534 ****
  	
  	regexperrorwithnumber (frbadgroupnameerror, pos, bsmsg);
! 	} /*replscanerror*/
  	
  
--- 1520,1524 ----
  	
  	regexperrorwithnumber (frbadgroupnameerror, pos, bsmsg);
! 	} /*regexpcheckerror*/
  	
  
***************
*** 1599,1604 ****
  						}
  					else { /*might be a named group*/
- 						
- 						long ref = 0;
  
  						while (p1 < pend && *p1 != '>')
--- 1589,1592 ----
***************
*** 1665,1669 ****
  
  
! static boolean regexpcompilereplacement (Handle hcp, char *p, long len, bigstring bserror, Handle *hreplaceparts) {
  
  	tyreplscancompileinfo info;
--- 1653,1657 ----
  
  
! static boolean regexpcompilereplacement (Handle hcp, char *p, long len, bigstring bserror, hdlreplacepart *hreplaceparts) {
  
  	tyreplscancompileinfo info;
***************
*** 1688,1692 ****
  		}
  	
! 	*hreplaceparts = closehandlestream (&info.s);
  
  	return (*hreplaceparts != nil);
--- 1676,1680 ----
  		}
  	
! 	*hreplaceparts = (hdlreplacepart) closehandlestream (&info.s);
  
  	return (*hreplaceparts != nil);
***************
*** 1744,1748 ****
  	*/
  	
- 	boolean fl = false;
  	tyvaluerecord vhandler;
  	hdlhashnode handlernode;
--- 1732,1735 ----
***************
*** 1759,1771 ****
  	/*build a code tree and call the handler, with our error hook in place*/
  	
! 	hcode = nil;
  	
  	if (vhandler.valuetype == codevaluetype) {
  
! 		hcode = vhandler.data.codevalue;
  	}
  	else if ((**htable).valueroutine == nil) { /*not a kernel table*/
  		
! 		if (!langexternalvaltocode (vhandler, &hcode)) {
  
  			langparamerror (notfunctionerror, bsverb);
--- 1746,1758 ----
  	/*build a code tree and call the handler, with our error hook in place*/
  	
! 	*hcode = nil;
  	
  	if (vhandler.valuetype == codevaluetype) {
  
! 		*hcode = vhandler.data.codevalue;
  	}
  	else if ((**htable).valueroutine == nil) { /*not a kernel table*/
  		
! 		if (!langexternalvaltocode (vhandler, hcode)) {
  
  			langparamerror (notfunctionerror, bsverb);
***************
*** 1774,1780 ****
  			}
  		
! 		if (hcode == nil) { /*needs compilation*/
  			
! 			if (!langcompilescript (handlernode, &hcode))
  				return (false);
  			}
--- 1761,1767 ----
  			}
  		
! 		if (*hcode == nil) { /*needs compilation*/
  			
! 			if (!langcompilescript (handlernode, hcode))
  				return (false);
  			}
***************
*** 1981,1985 ****
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = hsublist;
  		
  		fl = langpushlistval (hresult, nil, &vtemp);
--- 1968,1972 ----
  		initvalue (&vtemp, listvaluetype);
  		
! 		vtemp.data.binaryvalue = (Handle) hsublist;
  		
  		fl = langpushlistval (hresult, nil, &vtemp);
***************
*** 2270,2274 ****
  							(const char *)ptext, lentext, ixstart, lentext - ixstart,
  							getoptions (hcp) & PUBLIC_EXEC_OPTIONS,
! 							*hovector, getovectorsize (hcp), chartableptr); 
  
  		if (res <= 0)
--- 2257,2261 ----
  							(const char *)ptext, lentext, ixstart, lentext - ixstart,
  							getoptions (hcp) & PUBLIC_EXEC_OPTIONS,
! 							(int *) *hovector, getovectorsize (hcp), chartableptr); 
  
  		if (res <= 0)
***************
*** 2329,2333 ****
  	tyvaluerecord vtemp;
  	int options = 0;
- 	int capturecount = 0;
  	short ctconsumed = 1;
  	short ctpositional = 1;
--- 2316,2319 ----
***************
*** 2630,2634 ****
  		goto exit;
  	
! 	pushtmpstack (hreplaceparts);
  
  	/* run engine */
--- 2616,2620 ----
  		goto exit;
  	
! 	pushtmpstack ((Handle) hreplaceparts);
  
  	/* run engine */
***************
*** 2698,2702 ****
  	releaseheaptmp (hovec); /*no need to accumulate these on the tmp stack*/	
  	
! 	releaseheaptmp (hreplaceparts);
  	
  	/* set result */
--- 2684,2688 ----
  	releaseheaptmp (hovec); /*no need to accumulate these on the tmp stack*/	
  	
! 	releaseheaptmp ((Handle) hreplaceparts);
  	
  	/* set result */
***************
*** 2820,2824 ****
  		return (false);
  	
! 	if (!setheapvalue (hresult, listvaluetype, v))
  		return (false);
  	
--- 2806,2810 ----
  		return (false);
  	
! 	if (!setheapvalue ((Handle) hresult, listvaluetype, v))
  		return (false);
  	
***************
*** 2908,2912 ****
  		return (false);
  	
! 	if (!setheapvalue (hresult, listvaluetype, v))
  		return (false);
  
--- 2894,2898 ----
  		return (false);
  	
! 	if (!setheapvalue ((Handle) hresult, listvaluetype, v))
  		return (false);
  
***************
*** 3220,3224 ****
  		return (false);
  	
! 	if (!setheapvalue (hresult, listvaluetype, v))
  		return (false);
  	
--- 3206,3210 ----
  		return (false);
  	
! 	if (!setheapvalue ((Handle) hresult, listvaluetype, v))
  		return (false);
  	
***************
*** 3233,3237 ****
  		info.hresult = hresult;
  		info.flincludematches = flincludematches;
! 		info.bserrorptr = &bserror;
  		
  		flsuccess = langvisitlistvalues (&vsubject, &regexpgreplistitemscallback, (ptrvoid) &info);
--- 3219,3223 ----
  		info.hresult = hresult;
  		info.flincludematches = flincludematches;
! 		info.bserrorptr = (StringPtr) &bserror;
  		
  		flsuccess = langvisitlistvalues (&vsubject, &regexpgreplistitemscallback, (ptrvoid) &info);
***************
*** 3535,3539 ****
  		}
  			
! 	info.hgroups = vtemp.data.binaryvalue;
  
  	/* get namedGroups sub-table from info table*/
--- 3521,3525 ----
  		}
  			
! 	info.hgroups = (hdllistrecord) vtemp.data.binaryvalue;
  
  	/* get namedGroups sub-table from info table*/
***************
*** 3612,3616 ****
  			return (regexpgrepverb (hp1, v, bserror));
  		
! 		case getpatterinfofunc:
  			return (regexpgetpatterninfoverb (hp1, v, bserror));
  		
--- 3598,3602 ----
  			return (regexpgrepverb (hp1, v, bserror));
  		
! 		case getpatterninfofunc:
  			return (regexpgetpatterninfoverb (hp1, v, bserror));
  		
***************
*** 3633,3637 ****
  	assert (sizeof (regexp_default_tables) == tables_length); /*if this fails, something changed in the PCRE library*/
  	
! 	chartableptr = &regexp_default_tables; //was: pcre_maketables (); /*build char tables using current locale*/
  	
  	return (loadfunctionprocessor (idregexpverbs, &regexpfunctionvalue));
--- 3619,3623 ----
  	assert (sizeof (regexp_default_tables) == tables_length); /*if this fails, something changed in the PCRE library*/
  	
! 	chartableptr = regexp_default_tables; //was: pcre_maketables (); /*build char tables using current locale*/
  	
  	return (loadfunctionprocessor (idregexpverbs, &regexpfunctionvalue));

[frontierkernel-commits] Frontier/Common/source wpverbs.c,1.2,1.3 wpengine.c,1.2,1.3

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

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

Modified Files:
	wpverbs.c wpengine.c 
Log Message:
Fix GCC compiler warnings.

Index: wpverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wpverbs.c	23 Oct 2004 23:07:43 -0000	1.2
--- wpverbs.c	30 Oct 2004 20:49:51 -0000	1.3
***************
*** 174,178 ****
  #endif
  
! static errornum = 0; /*error number exclusively for wp routines*/
  
  
--- 174,178 ----
  #endif
  
! static short errornum = 0; /*error number exclusively for wp routines*/
  
  
***************
*** 516,520 ****
  
  	register hdlwpvariable hv = (hdlwpvariable) h;
- 	register boolean flpacked = (**hv).flpacked;
  	register hdlwprecord hwp;
  	register boolean fl;
--- 516,519 ----
***************
*** 806,809 ****
--- 805,810 ----
  
  
+ #if 0
+ 
  static boolean getwpparam (hdltreenode hfirst, short pnum, hdlwpvariable *hv) {
  	
***************
*** 840,843 ****
--- 841,846 ----
  	} /*getwpparam*/
  
+ #endif
+ 
  
  boolean wpwindowopen (hdlexternalvariable hvariable, hdlwindowinfo *hinfo) {
***************
*** 1812,1816 ****
  	boolean flwindowopen;
  	hdlwindowinfo hinfo;
- 	boolean flfromtop = true;
  	
  	fltempload = !(**hv).flinmemory;
--- 1815,1818 ----
***************
*** 1910,1919 ****
  
  
! static boolean wpverbgetvariable (hdlexternalvariable *hvariable) {
  	
  	if (wpdata == nil)
  		return (false);
  	
! 	*hvariable = (hdlexternalvariable) (**wpdata).wprefcon;
  	
  	return (true);
--- 1912,1923 ----
  
  
! static boolean wpverbgetvariable (void *hvariable) {
! 	
! 	hdlexternalvariable *hv = (hdlexternalvariable *) hvariable;
  	
  	if (wpdata == nil)
  		return (false);
  	
! 	*hv = (hdlexternalvariable) (**wpdata).wprefcon;
  	
  	return (true);
***************
*** 1921,1930 ****
  
  
- static boolean wpverbgetwpdata (void) {
- 	
- 	return (true);
- 	} /*wpverbgetwpdata*/
- 
- 
  static boolean wpverbgettargetdata (short id) {
  	
--- 1925,1928 ----

Index: wpengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wpengine.c	23 Oct 2004 23:07:16 -0000	1.2
--- wpengine.c	30 Oct 2004 20:49:51 -0000	1.3
***************
*** 93,97 ****
  // static Handle hlastundodata = nil;
  
! static boolean fldestroycaret = false; /*7.0b16 PBS: global for destroying caret in main thread on Windows.*/
  
  
--- 93,99 ----
  // static Handle hlastundodata = nil;
  
! #ifdef WIN95VERSION
! 	static boolean fldestroycaret = false; /*7.0b16 PBS: global for destroying caret in main thread on Windows.*/
! #endif
  
  
***************
*** 1379,1382 ****
--- 1381,1386 ----
  
  
+ #if 0
+ 
  static boolean wpfilterstyles (Handle htext, pg_ref pg, boolean redraw) {
  
***************
*** 1395,1398 ****
--- 1399,1404 ----
  	} /*wpfilterstyles*/
  
+ #endif
+ 
  
  boolean wpmeasuretext (Handle htext, Rect *r, tywpflags wpflags) {
***************
*** 4502,4507 ****
  	*/
  	
- 	hdlwprecord wp = wpdata;
- 
  	if (wpsetglobals ()) {
  		
--- 4508,4511 ----

[frontierkernel-commits] Frontier/Common/headers wpengine.h,1.2,1.3

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

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

Modified Files:
	wpengine.h 
Log Message:
Fix GCC compiler warnings.

Index: wpengine.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/wpengine.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wpengine.h	28 Oct 2004 23:03:43 -0000	1.2
--- wpengine.h	30 Oct 2004 20:49:31 -0000	1.3
***************
*** 42,45 ****
--- 42,47 ----
  #endif
  
+ typedef struct tywprecord *ptrwprecord, **hdlwprecord; /* forward declaration */
+ 
  #if !TARGET_CARBON
  #if GENERATINGCFM
***************
*** 59,63 ****
  				CallUniversalProc((UniversalProcPtr)(userRoutine), uppTrackClickProcInfo, wp, pt)
  	#else
! 		typedef pascal void (*TrackClickProcPtr) (struct tywprecord **, Point);
  		
  		typedef TrackClickProcPtr TrackClickUPP;
--- 61,65 ----
  				CallUniversalProc((UniversalProcPtr)(userRoutine), uppTrackClickProcInfo, wp, pt)
  	#else
! 		typedef pascal void (*TrackClickProcPtr) (hdlwprecord, Point);
  		
  		typedef TrackClickProcPtr TrackClickUPP;
***************
*** 70,74 ****
  #endif
  #else //TARGET CARBON Timothy Paustian
! 		typedef pascal void (*TrackClickProcPtr) (struct tywprecord **, Point);
  		
  		typedef TrackClickProcPtr TrackClickUPP;
--- 72,76 ----
  #endif
  #else //TARGET CARBON Timothy Paustian
! 		typedef pascal void (*TrackClickProcPtr) (hdlwprecord, Point);
  		
  		typedef TrackClickProcPtr TrackClickUPP;
***************
*** 166,170 ****
  	
  	boolean fleditingnow; //between pre- and postedit?
! 	} tywprecord, *ptrwprecord, **hdlwprecord;
  
  
--- 168,172 ----
  	
  	boolean fleditingnow; //between pre- and postedit?
! 	} tywprecord;
  
  

[frontierkernel-commits] Frontier/Common/source langlist.c,1.3,1.4

[Henri A. <has...@us...>]

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

Modified Files:
	langlist.c 
Log Message:
Record additions now always happen from the right side to the left, with de-duping. List additions can happen from left to right or right to left, depending on their relative size.
The real solution for lists should be to simply link them instead of add, but I'm still trying to decypher the data structures.

Index: langlist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** langlist.c	29 Oct 2004 09:02:23 -0000	1.3
--- langlist.c	29 Oct 2004 23:54:20 -0000	1.4
***************
*** 907,911 ****
  	n = opcountlistitems ((*v2).data.listvalue);
  	
! 	if ( m > n ) { /* the first list is longer than the second: append to the first */
  		list2 = (*v2).data.listvalue;
  		*vreturned = *v1;
--- 907,915 ----
  	n = opcountlistitems ((*v2).data.listvalue);
  	
! 	if ( (m > n) || (**(*v2).data.listvalue).isrecord ) {
! 		/* Either the first list is longer than the second:
! 		   append to the first, or we are adding records so we want to
! 		   de-dupe the entries always in the same way
! 		*/
  		list2 = (*v2).data.listvalue;
  		*vreturned = *v1;
***************
*** 922,929 ****
  				return (false);
  
! 			if ((**list3).isrecord) {
  				
  				if (opgetlisthandle (list3, -1, key, &hignore))
! 					disposehandle (hitem);
  				else
  					oppushhandle (list3, key, hitem);
--- 926,933 ----
  				return (false);
  
! 			if ((**list3).isrecord) { /* discard duplicate keys */
  				
  				if (opgetlisthandle (list3, -1, key, &hignore))
! 					disposehandle (hitem); /* discard the duplicate. don't push it over */
  				else
  					oppushhandle (list3, key, hitem);
***************
*** 948,960 ****
  				return (false);
  
! 			if ((**list3).isrecord) {
! 				
! 				if (opgetlisthandle (list3, -1, key, &hignore))
! 					disposehandle (hitem);
! 				else
! 					opunshifthandle (list3, key, hitem);
! 				}
! 			else
! 				opunshifthandle (list3, key, hitem);
  			} /*for*/
  	}		
--- 952,956 ----
  				return (false);
  
! 			opunshifthandle (list3, key, hitem);
  			} /*for*/
  	}		

[frontierkernel-commits] Frontier/Common/UserLandIACToolkit landsystem7.c,1.4,1.5

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

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

Modified Files:
	landsystem7.c 
Log Message:
Fixed breakage from fixing GCC compiler warnings.

Index: landsystem7.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem7.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** landsystem7.c	29 Oct 2004 20:59:44 -0000	1.4
--- landsystem7.c	29 Oct 2004 21:56:45 -0000	1.5
***************
*** 2040,2044 ****
  		return (errAECoercionFail);
  	
! 	return (AECreateDesc (text, x + 4, len - 4, result)); /*skip over script & language codes*/
  	} /*whyinternational*/
  
--- 2040,2044 ----
  		return (errAECoercionFail);
  	
! 	return (AECreateDesc (text, ((Ptr) x) + 4, len - 4, result)); /*skip over script & language codes*/
  	} /*whyinternational*/
  

[frontierkernel-commits] Frontier/Common/source dockmenu.c,1.2,1.3

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

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

Modified Files:
	dockmenu.c 
Log Message:
Fixed breakage from fixing GCC compiler warnings.

Index: dockmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dockmenu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dockmenu.c	23 Oct 2004 22:16:56 -0000	1.2
--- dockmenu.c	29 Oct 2004 21:55:24 -0000	1.3
***************
*** 430,434 ****
  static void dockmenuinstallhandler (void) {
  	
- 	OSErr ec = noErr;		
  	EventTypeSpec myevents = {kEventClassCommand, kEventCommandProcess};
  	
--- 430,433 ----

[frontierkernel-commits] Frontier/Common/source filedialog.c,1.3,1.4

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

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

Modified Files:
	filedialog.c 
Log Message:
Fixed breakage from fixing GCC compiler warnings.

Index: filedialog.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filedialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** filedialog.c	29 Oct 2004 19:58:27 -0000	1.3
--- filedialog.c	29 Oct 2004 21:51:47 -0000	1.4
***************
*** 494,497 ****
--- 494,502 ----
  	FSSpec *fs = &sfdata.sfreply.sfFile;
  	OSErr	anErr = noErr;
+ 	#if !TARGET_API_MAC_CARBON
+ 	 	Point pt = {-1, -1};
+ 	 	short cttypes = -1;
+ 	 	OSType *types = nil;
+ 	#endif	
  	#ifdef flcomponent
  	long appA5;

[frontierkernel-commits] Frontier/Common/source pictverbs.c,1.2,1.3 pict.c,1.2,1.3

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

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

Modified Files:
	pictverbs.c pict.c 
Log Message:
Fixed GCC compiler warnings.

Index: pictverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/pictverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pictverbs.c	23 Oct 2004 22:48:40 -0000	1.2
--- pictverbs.c	29 Oct 2004 21:14:52 -0000	1.3
***************
*** 636,639 ****
--- 636,641 ----
  
  
+ #if 0
+ 
  static boolean getpictparam (hdltreenode hfirst, short pnum, hdlpictvariable *hv) {
  	
***************
*** 657,660 ****
--- 659,664 ----
  	} /*getpictparam*/
  
+ #endif
+ 
  
  static boolean pictverbscheduleupdate (hdltreenode hparam1, tyvaluerecord *v) {
***************
*** 675,678 ****
--- 679,684 ----
  			
  
+ #if 0
+ 
  static boolean pictverbbitmapupdate (hdltreenode hparam1, tyvaluerecord *v) {
  	
***************
*** 690,693 ****
--- 696,701 ----
  	return (true);
  	} /*pictverbbitmapupdate*/
+ 
+ #endif
  	
  			
***************
*** 708,717 ****
  	} /*pictverbevaluator*/
  
! /*
  static boolean pictverbgetbounds (hdltreenode hparam1, tyvaluerecord *v) {
  	
  	Rect r;
  	
! 	if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters%/
  		return (false);
  	
--- 716,727 ----
  	} /*pictverbevaluator*/
  
! 
! #if 0
! 
  static boolean pictverbgetbounds (hdltreenode hparam1, tyvaluerecord *v) {
  	
  	Rect r;
  	
! 	if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters*/
  		return (false);
  	
***************
*** 722,725 ****
--- 732,737 ----
   	} /*pictverbgetbounds*/
  
+ #endif
+ 
  
  static boolean pictverbgetpicture (hdltreenode hparam1, tyvaluerecord *v) {
***************
*** 973,977 ****
  		return (false);
  	
! 	return (shellsetscrap (hpicture, pictscraptype, disposehandle, nil));
  	} /*pictcopy*/
  
--- 985,989 ----
  		return (false);
  	
! 	return (shellsetscrap (hpicture, pictscraptype, (shelldisposescrapcallback) &disposehandle, nil));
  	} /*pictcopy*/
  
***************
*** 1026,1030 ****
  
  
! static boolean pictgetvariable (hdlexternalvariable *hvariable) {
  	
  	if (pictdata == nil)
--- 1038,1044 ----
  
  
! static boolean pictgetvariable (void *refcon) {
! 	
! 	hdlexternalvariable *hvariable = (hdlexternalvariable *) refcon;
  	
  	if (pictdata == nil)

Index: pict.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/pict.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pict.c	23 Oct 2004 22:48:28 -0000	1.2
--- pict.c	29 Oct 2004 21:14:52 -0000	1.3
***************
*** 332,337 ****
  	return (true);
  	} /*pictdisposerecord*/
! 	
! /*
  static boolean pictdebug (PicHandle macpicture) { 
  
--- 332,339 ----
  	return (true);
  	} /*pictdisposerecord*/
! 
! 
! #if 0
! 
  static boolean pictdebug (PicHandle macpicture) { 
  
***************
*** 354,358 ****
  	
  
- /*
  boolean pictreadfile (bigstring fname, PicHandle *macpicture) {
  	
--- 356,359 ----
***************
*** 367,371 ****
  	ctbytes = filegetsize (fnum) - pictstartrealdata;
  	
! 	if (ctbytes <= 0) /*error, this can't be a PICT file%/
  		goto error;
  	
--- 368,372 ----
  	ctbytes = filegetsize (fnum) - pictstartrealdata;
  	
! 	if (ctbytes <= 0) /*error, this can't be a PICT file*/
  		goto error;
  	
***************
*** 376,380 ****
  		goto error;
  	
! 	hp = *macpicture; /*copy into register%/
  	
  	lockhandle ((Handle) hp);
--- 377,381 ----
  		goto error;
  	
! 	hp = *macpicture; /*copy into register*/
  	
  	lockhandle ((Handle) hp);
***************
*** 389,393 ****
  	closefile (fnum);
  	
! 	/*pictdebug (*macpicture);%/
  	
  	return (true);
--- 390,394 ----
  	closefile (fnum);
  	
! 	/*pictdebug (*macpicture);*/
  	
  	return (true);
***************
*** 404,407 ****
--- 405,410 ----
  	} /*pictreadfile*/
  	
+ #endif
+ 
  
  void pictresetscrollbars (void) {

[frontierkernel-commits] Frontier/Common/SystemHeaders land.h,1.3,1.4

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

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

Modified Files:
	land.h 
Log Message:
Fixed GCC compiler warnings.

Index: land.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/land.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** land.h	28 Oct 2004 23:00:16 -0000	1.3
--- land.h	29 Oct 2004 20:59:57 -0000	1.4
***************
*** 574,579 ****
  	pascal boolean landdeleteverb (tyverbclass, tyverbtoken);
  	
- 	pascal void landsystem7checktimeouts (EventRecord *ev);
- 	
  	pascal boolean landeventfilter (EventRecord *);
  	
--- 574,577 ----

[frontierkernel-commits] Frontier/Common/UserLandIACToolkit land.c,1.2,1.3 landsystem7.c,1.3,1.4

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

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

Modified Files:
	land.c landsystem7.c 
Log Message:
Fixed GCC compiler warnings.

Index: landsystem7.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem7.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** landsystem7.c	24 Oct 2004 16:52:16 -0000	1.3
--- landsystem7.c	29 Oct 2004 20:59:44 -0000	1.4
***************
*** 132,136 ****
  		AEEventID eventID;
  		DescType typeCode;
! 		int ctbytes;
  		
  		if (AEGetAttributePtr(ev, keyEventIDAttr, typeType, &typeCode,
--- 132,136 ----
  		AEEventID eventID;
  		DescType typeCode;
! 		Size ctbytes;
  		
  		if (AEGetAttributePtr(ev, keyEventIDAttr, typeType, &typeCode,
***************
*** 174,177 ****
--- 174,180 ----
  */
  
+ 
+ #if TARGET_API_MAC_OS8
+ 
  static void MakePascalStringWLen (StringPtr theDest, int theDestLen, char *theSrc, int theSrcLen) {
  	
***************
*** 192,197 ****
  
  
- #if TARGET_API_MAC_OS8
- 
  static OSErr HCProgramToPortAndLoc (char *theName, short len, LocationNameRec *theLoc, PortInfoRec *thePort) {
  	
--- 195,198 ----
***************
*** 437,440 ****
--- 438,445 ----
  
  
+ #if !TARGET_API_MAC_CARBON
+ 	//Code change by Timothy Paustian Friday, July 21, 2000 10:40:43 PM
+ 	//we don't do anything on Carbon because we can't use this anyway.
+ 
  static pascal Boolean landbrowserfilter (LocationNamePtr ln, PortInfoPtr port) {
  	
***************
*** 446,452 ****
  	
  	#ifdef flcomponent
! 	
! 	long curA5 = SetUpAppA5 ();
! 	
  	#endif
  	
--- 451,455 ----
  	
  	#ifdef flcomponent
! 		long curA5 = SetUpAppA5 ();
  	#endif
  	
***************
*** 456,462 ****
  	
  	#ifdef flcomponent
! 	
! 	RestoreA5 (curA5);
! 	
  	#endif
  	
--- 459,463 ----
  	
  	#ifdef flcomponent
! 		RestoreA5 (curA5);
  	#endif
  	
***************
*** 473,492 ****
  
  
! #if !TARGET_RT_MAC_CFM
! 
! 	#define landbrowserfilterUPP (&landbrowserfilter)
  
! #else
  
- 	#if TARGET_API_MAC_CARBON == 1
- 	//Code change by Timothy Paustian Friday, July 21, 2000 10:40:43 PM
- 	//we don't do anything because we can't use this anyway.
  	#else
! 		
! 	static RoutineDescriptor landbrowserfilterDesc = BUILD_ROUTINE_DESCRIPTOR (uppPPCFilterProcInfo, landbrowserfilter);
  
! 	#define landbrowserfilterUPP (&landbrowserfilterDesc)
  	#endif
- 		
  	
  #endif
--- 474,488 ----
  
  
! 	#if !TARGET_RT_MAC_CFM
  
! 		#define landbrowserfilterUPP (&landbrowserfilter)
  
  	#else
! 				
! 		static RoutineDescriptor landbrowserfilterDesc = BUILD_ROUTINE_DESCRIPTOR (uppPPCFilterProcInfo, landbrowserfilter);
  
! 		#define landbrowserfilterUPP (&landbrowserfilterDesc)
! 	
  	#endif
  	
  #endif
***************
*** 798,807 ****
  	
  	return (true); /*loop completed, all params popped with no errors*/
- 	
- 	error:
- 	
- 	landdisposeverb (hv);
- 	
- 	return (false);
  	} /*landsystem7unpackverb*/
  
--- 794,797 ----
***************
*** 991,995 ****
  
  
! static pascal boolean replyidvisit (hdlsys7transportinfo ht, long id) {
  	
  	return ((**ht).replyid == (short) id);
--- 981,987 ----
  
  
! static pascal boolean replyidvisit (Handle htinfo, long id) {
! 	
! 	hdlsys7transportinfo ht = (hdlsys7transportinfo) htinfo;
  	
  	return ((**ht).replyid == (short) id);
***************
*** 1375,1386 ****
  
  
- static pascal Boolean landsystem7filterroutine (EventRecord *ev, long returnid, long transactionid, AEAddressDesc *sender) {
- 	
- 	#pragma unused (ev, returnid, transactionid, sender)
- 	
- 	return (true); /*accept the event*/
- 	} /*landsystem7filterroutine*/
- 
- 
  pascal boolean landsystem7geteventrecords (hdlverbrecord hverb, AppleEvent *event, AppleEvent *reply) {
  	
--- 1367,1370 ----
***************
*** 1599,1608 ****
  	} /*landsystem7send*/
  
- /*
- static pascal boolean timeoutvisit (hdlsys7transportinfo ht, long ticksnow) {
- 	
- 	return ((**ht).waketime <= (unsigned long) ticksnow); //sleeping too long
- 	} /*timeoutvisit*/
- 
  
  static pascal void landsystem7checktimeouts (EventRecord *ev) {
--- 1583,1586 ----
***************
*** 1747,1751 ****
  		//A5 worlds make no sense on PPC so why pass this as our refcon
  		#if TARGET_API_MAC_CARBON == 1
- 		long	landCode = 'LAND';
  		errcode = AEInstallEventHandler (class, token, handler, (long) nil, true);
  		#else
--- 1725,1728 ----
***************
*** 1764,1772 ****
  		#if TARGET_API_MAC_CARBON == 1
  
! 			return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerUPP (handler)));
  		
  		#else
  
! 			return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerProc (handler)));
  		
  		#endif
--- 1741,1749 ----
  		#if TARGET_API_MAC_CARBON == 1
  
! 			return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerUPP ((AEEventHandlerProcPtr) handler)));
  		
  		#else
  
! 			return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerProc ((AEEventHandlerProcPtr) handler)));
  		
  		#endif
***************
*** 1778,1786 ****
  		#if TARGET_API_MAC_CARBON == 1
  	
! 			return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerUPP (handler)));
  		
  		#else
  
! 			return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerProc (handler)));
  		
  		#endif
--- 1755,1763 ----
  		#if TARGET_API_MAC_CARBON == 1
  	
! 			return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerUPP ((AEEventHandlerProcPtr) handler)));
  		
  		#else
  
! 			return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerProc ((AEEventHandlerProcPtr) handler)));
  		
  		#endif
***************
*** 1797,1801 ****
  		#endif
  		
! return (landsystem7installhandlerUPP (class, typeWildCard, landsystem7handleeventUPP));
  		} /*landsystem7addclass*/
  	
--- 1774,1778 ----
  		#endif
  		
! 		return (landsystem7installhandlerUPP (class, typeWildCard, landsystem7handleeventUPP));
  		} /*landsystem7addclass*/
  	
***************
*** 1950,1954 ****
  	
  	/*
! 	fl = landsystem7unpackdesc (&desc, key, param); /*may set desc's data to nil%/
  	
  	AEDisposeDesc (&desc);
--- 1927,1931 ----
  	
  	/*
! 	fl = landsystem7unpackdesc (&desc, key, param); /%may set desc's data to nil%/
  	
  	AEDisposeDesc (&desc);
***************
*** 1990,1994 ****
  	
  	/*
! 	fl = landsystem7unpackdesc (&desc, key, param); /*may set desc's data to nil%/
  	
  	AEDisposeDesc (&desc);
--- 1967,1971 ----
  	
  	/*
! 	fl = landsystem7unpackdesc (&desc, key, param); /%may set desc's data to nil%/
  	
  	AEDisposeDesc (&desc);
***************
*** 2058,2062 ****
  
  
! static pascal OSErr whyinternational (DescType itxt, Ptr x, long len, DescType text, long refcon, AEDesc *result) {
  	
  	if (*(short *) x != smRoman) /*can't treat this as plain text*/
--- 2035,2039 ----
  
  
! static pascal OSErr whyinternational (DescType itxt, const void *x, Size len, DescType text, SInt32 refcon, AEDesc *result) {
  	
  	if (*(short *) x != smRoman) /*can't treat this as plain text*/

Index: land.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/land.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** land.c	23 Oct 2004 21:30:06 -0000	1.2
--- land.c	29 Oct 2004 20:59:44 -0000	1.3
***************
*** 57,61 ****
  static THz landzone;
  
! static Handle landresmap;
  
  static short landresfile;
--- 57,63 ----
  static THz landzone;
  
! #if !TARGET_API_MAC_CARBON
! 	static Handle landresmap;
! #endif
  
  static short landresfile;
***************
*** 115,121 ****
  	
  pascal hdllandglobals landgetglobals (void) {
! 	
! 	/*extern pascal hdllandglobals landgetlandglobals (); /*implemented in landstorage.a.¹*/
! 	
  	return (landgetlandglobals ()); /*return value of asm routine*/
  	} /*landgetglobals*/
--- 117,121 ----
  	
  pascal hdllandglobals landgetglobals (void) {
! 		
  	return (landgetlandglobals ()); /*return value of asm routine*/
  	} /*landgetglobals*/
***************
*** 511,515 ****
  	
  	/*
! 	if (landwindoweventfilter (ev)) /*event consumed by stats window%/
  		return (true);
  	*/
--- 511,515 ----
  	
  	/*
! 	if (landwindoweventfilter (ev)) /%event consumed by stats window%/
  		return (true);
  	*/
***************
*** 639,643 ****
  	register hdllandglobals hg = landgetglobals ();
  	
! 	if ((**hg).transport == macsystem7) /*DW 6/25/91%/
  		return (false);
  	
--- 639,643 ----
  	register hdllandglobals hg = landgetglobals ();
  	
! 	if ((**hg).transport == macsystem7) /%DW 6/25/91%/
  		return (false);
  	
***************
*** 650,656 ****
  static landqueuepopcallback threadvisit;
  
! static pascal boolean sleepingthreadvisit (hdltransportinfo ht, long refcon) {
  	
! 	if ((*threadvisit) ((**ht).hthread, refcon)) {
  		
  		processwake ((**ht).hthread);
--- 650,658 ----
  static landqueuepopcallback threadvisit;
  
! static pascal boolean sleepingthreadvisit (Handle htinfo, long refcon) {
  	
! 	hdltransportinfo ht = (hdltransportinfo) htinfo;
! 	
! 	if ((*threadvisit) ((Handle) (**ht).hthread, refcon)) {
  		
  		processwake ((**ht).hthread);
***************
*** 777,781 ****
  	(**hg).flconnected = true;
  	
! 	/**landsetmemstats (); /*copy freemem into globals -- for use in stats window*/
  	
  	return (true);
--- 779,783 ----
  	(**hg).flconnected = true;
  	
! 	//landsetmemstats (); /*copy freemem into globals -- for use in stats window*/
  	
  	return (true);

[frontierkernel-commits] Frontier/Common/IowaRuntime/Headers iowafrontier.h,1.1,1.2

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

Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13230

Modified Files:
	iowafrontier.h 
Log Message:
Fixed GCC compiler warnings.

Index: iowafrontier.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Headers/iowafrontier.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iowafrontier.h	9 Oct 2004 20:22:42 -0000	1.1
--- iowafrontier.h	29 Oct 2004 20:38:34 -0000	1.2
***************
*** 29,33 ****
  #define idfrontier 			'LAND'
  
! boolean findfrontiercomponent ();
  
  boolean frontStartCard (AEDesc *);
--- 29,33 ----
  #define idfrontier 			'LAND'
  
! boolean findfrontiercomponent (void);
  
  boolean frontStartCard (AEDesc *);

[frontierkernel-commits] Frontier/Common/IowaRuntime/Source iowaruntime.c,1.2,1.3 iowavalidate.c,1.2,1.3 iowafrontier.c,1.2,1.3 iowaattributes.c,1.2,1.3 iowacomponent.c,1.2,1.3 iowacore.c,1.2,1.3

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

Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13137

Modified Files:
	iowaruntime.c iowavalidate.c iowafrontier.c iowaattributes.c 
	iowacomponent.c iowacore.c 
Log Message:
Fixed GCC compiler warnings.

Index: iowaruntime.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaruntime.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowaruntime.c	23 Oct 2004 21:43:04 -0000	1.2
--- iowaruntime.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 83,94 ****
  
  
- 
- 
- 
- 
- static void defaultActivate (boolean flactivate) {
- 	} /*defaultActivate*/
- 	
- 	
  static short sizewindowarray (void) {
  	
--- 83,86 ----
***************
*** 2180,2184 ****
--- 2172,2178 ----
  	*/
  	
+ 	#if !TARGET_API_MAC_CARBON
  	long curA5 = SetUpAppA5 ();
+ 	#endif
  
  	IACglobals.event = (AppleEvent *) event; 
***************
*** 2233,2239 ****
  			break;
  		} /*switch*/
! 	
  	RestoreA5 (curA5);
! 	
  	return (noErr);
  	} /*appleEventHandler*/
--- 2227,2235 ----
  			break;
  		} /*switch*/
! 
! 	#if !TARGET_API_MAC_CARBON
  	RestoreA5 (curA5);
! 	#endif
! 		
  	return (noErr);
  	} /*appleEventHandler*/

Index: iowafrontier.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowafrontier.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowafrontier.c	23 Oct 2004 21:42:31 -0000	1.2
--- iowafrontier.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 322,326 ****
  
  
! boolean findfrontiercomponent () {
  	
  	return (findlangcomponent (idfrontier) != 0);
--- 322,326 ----
  
  
! boolean findfrontiercomponent (void) {
  	
  	return (findlangcomponent (idfrontier) != 0);
***************
*** 512,516 ****
  	
  	/*
! 	if (equalstrings (tablename, lasttablename) && (lasttablewasmajor || !flmajorswitch)) /*minimize AE traffic%/
  		return (true);
  	
--- 512,516 ----
  	
  	/*
! 	if (equalstrings (tablename, lasttablename) && (lasttablewasmajor || !flmajorswitch)) /%minimize AE traffic%/
  		return (true);
  	

Index: iowavalidate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowavalidate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowavalidate.c	23 Oct 2004 21:43:27 -0000	1.2
--- iowavalidate.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 76,80 ****
  static boolean validateobjectlist (hdlobject hlist) {
  	
- 	hdlcard hc = iowadata;
  	hdlobject h = hlist;
  	
--- 76,79 ----
***************
*** 203,207 ****
  		#endif
  		
! 		if (thePort != (**iowadata).drawwindow)	/*dmb 1.31.96: use quickdrawglobal*/
  			invalid ("\pdrawing into the wrong port");
  		}
--- 202,206 ----
  		#endif
  		
! 		if (thePort != (CGrafPtr) (**iowadata).drawwindow)	/*dmb 1.31.96: use quickdrawglobal*/
  			invalid ("\pdrawing into the wrong port");
  		}

Index: iowaattributes.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaattributes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowaattributes.c	23 Oct 2004 21:41:41 -0000	1.2
--- iowaattributes.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 44,51 ****
  	#include "iowaruntime.h"
  
- 	static hdlruntimerecord oldruntimedata = nil;
- 
- 	static hdlcard oldiowadata = nil;
- 
  #endif
  
--- 44,47 ----
***************
*** 107,110 ****
--- 103,108 ----
  
  
+ #if 0
+ 
  static boolean IACpushobjectparam (hdlobject hobject, OSType keyword) {
  
***************
*** 124,127 ****
--- 122,127 ----
  	} /*IACpushobjectparam*/
  
+ #endif
+ 
  	
  boolean IACgetobjectattributes (Handle objectname) {

Index: iowacore.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowacore.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowacore.c	23 Oct 2004 21:42:20 -0000	1.2
--- iowacore.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 1590,1593 ****
--- 1590,1595 ----
  	} /*checkrectoperation*/
  	
+ 
+ #if 0
  	
  static boolean trackingandhot (void) {
***************
*** 1595,1598 ****
--- 1597,1602 ----
  	return ((**iowadata).tracking && (**iowadata).trackerpressed);
  	} /*trackingandhot*/
+ 
+ #endif
  	
  	
***************
*** 2569,2573 ****
  	} /*runbuttonscript*/
  	
! 	
  static boolean afterclonevisit (hdlobject h) {
  	
--- 2573,2579 ----
  	} /*runbuttonscript*/
  	
! 
! #if 0
! 
  static boolean afterclonevisit (hdlobject h) {
  	
***************
*** 2579,2582 ****
--- 2585,2590 ----
  	return (true);
  	} /*afterclonevisit*/
+ 
+ #endif
  	
  	

Index: iowacomponent.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowacomponent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iowacomponent.c	23 Oct 2004 21:41:53 -0000	1.2
--- iowacomponent.c	29 Oct 2004 20:38:21 -0000	1.3
***************
*** 118,122 ****
  		#define	getconfigGlueParamSize	(sizeof (config))
  		
! 		struct getconfigGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 118,122 ----
  		#define	getconfigGlueParamSize	(sizeof (config))
  		
! 		struct getconfigGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 136,140 ****
  		#if TARGET_API_MAC_CARBON == 1
  		{
! 		return  CallComponentDispatch(&pb);
  		}
  		#else	
--- 136,140 ----
  		#if TARGET_API_MAC_CARBON == 1
  		{
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		}
  		#else	
***************
*** 165,169 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 165,169 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 176,180 ****
  		#define	initobjectGlueParamSize	(sizeof (obj))
  		
! 		struct initobjectGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 176,180 ----
  		#define	initobjectGlueParamSize	(sizeof (obj))
  		
! 		struct initobjectGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 193,197 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 193,197 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 204,208 ****
  		#define	debugGlueParamSize	(sizeof (h) + sizeof (errorstring))
  		
! 		struct debugGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 204,208 ----
  		#define	debugGlueParamSize	(sizeof (h) + sizeof (errorstring))
  		
! 		struct debugGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 223,227 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 223,227 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 234,238 ****
  		#define	clickGlueParamSize	(sizeof (listhead) + sizeof (h) + sizeof (pt) + sizeof (short) + sizeof (short))
  		
! 		struct clickGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 234,238 ----
  		#define	clickGlueParamSize	(sizeof (listhead) + sizeof (h) + sizeof (pt) + sizeof (short) + sizeof (short))
  		
! 		struct clickGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 261,265 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 261,265 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 272,276 ****
  		#define	cleanGlueParamSize	(sizeof (h) + sizeof (height) + sizeof (width) + sizeof (r))
  		
! 		struct cleanGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 272,276 ----
  		#define	cleanGlueParamSize	(sizeof (h) + sizeof (height) + sizeof (width) + sizeof (r))
  		
! 		struct cleanGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 295,299 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 295,299 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 306,310 ****
  		#define	recalcGlueParamSize	(sizeof (h) + sizeof (short))
  		
! 		struct recalcGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 306,310 ----
  		#define	recalcGlueParamSize	(sizeof (h) + sizeof (short))
  		
! 		struct recalcGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 326,330 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 326,330 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 337,341 ****
  		#define	editGlueParamSize	(sizeof (h) + sizeof (short))
  		
! 		struct editGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 337,341 ----
  		#define	editGlueParamSize	(sizeof (h) + sizeof (short))
  		
! 		struct editGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 357,361 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 357,361 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 368,372 ****
  		#define	keyGlueParamSize	(sizeof (h) + sizeof (ch))
  		
! 		struct keyGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 368,372 ----
  		#define	keyGlueParamSize	(sizeof (h) + sizeof (ch))
  		
! 		struct keyGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 387,391 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 387,391 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 398,402 ****
  		#define	idleGlueParamSize	(sizeof (h))
  		
! 		struct idleGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 398,402 ----
  		#define	idleGlueParamSize	(sizeof (h))
  		
! 		struct idleGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 415,419 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 415,419 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 426,430 ****
  		#define	getvalueGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct getvalueGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 426,430 ----
  		#define	getvalueGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct getvalueGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 445,449 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 445,449 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 456,460 ****
  		#define	setvalueGlueParamSize	(sizeof (h) + sizeof (hvalue))
  		
! 		struct setvalueGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 456,460 ----
  		#define	setvalueGlueParamSize	(sizeof (h) + sizeof (hvalue))
  		
! 		struct setvalueGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 475,479 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 475,479 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 486,490 ****
  		#define	setcursorGlueParamSize	(sizeof (h) + sizeof (pt))
  		
! 		struct setcursorGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 486,490 ----
  		#define	setcursorGlueParamSize	(sizeof (h) + sizeof (pt))
  		
! 		struct setcursorGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 505,509 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 505,509 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 516,520 ****
  		#define	unpackdataGlueParamSize	(sizeof (h))
  		
! 		struct unpackdataGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 516,520 ----
  		#define	unpackdataGlueParamSize	(sizeof (h))
  		
! 		struct unpackdataGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 533,537 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 533,537 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 544,548 ****
  		#define	getattributesGlueParamSize	(sizeof (h) + sizeof (event))
  		
! 		struct getattributesGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 544,548 ----
  		#define	getattributesGlueParamSize	(sizeof (h) + sizeof (event))
  		
! 		struct getattributesGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 563,567 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 563,567 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 574,578 ****
  		#define	setattributesGlueParamSize	(sizeof (h) + sizeof (event))
  		
! 		struct setattributesGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 574,578 ----
  		#define	setattributesGlueParamSize	(sizeof (h) + sizeof (event))
  		
! 		struct setattributesGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 593,597 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 593,597 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 599,602 ****
--- 599,603 ----
  		} /*setattributesGlue*/
  	
+ #ifndef iowaRuntime
  	
  	static pascal ComponentResult geticonGlue (ComponentInstance comp, Handle *h) {
***************
*** 604,608 ****
  		#define	geticonGlueParamSize	(sizeof (h))
  		
! 		struct geticonGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 605,609 ----
  		#define	geticonGlueParamSize	(sizeof (h))
  		
! 		struct geticonGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 621,629 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
  		#endif
  		} /*geticonGlue*/
  	
  	
--- 622,632 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
  		#endif
  		} /*geticonGlue*/
+ 
+ #endif
  	
  	
***************
*** 632,636 ****
  		#define	getcardGlueParamSize	(sizeof (hcard))
  		
! 		struct getcardGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 635,639 ----
  		#define	getcardGlueParamSize	(sizeof (hcard))
  		
! 		struct getcardGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 649,653 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 652,656 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 660,664 ****
  		#define	packdataGlueParamSize	(sizeof (h) + sizeof (hpackeddata))
  		
! 		struct packdataGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 663,667 ----
  		#define	packdataGlueParamSize	(sizeof (h) + sizeof (hpackeddata))
  		
! 		struct packdataGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 679,683 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 682,686 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 690,694 ****
  		#define	disposedataGlueParamSize	(sizeof (h))
  		
! 		struct disposedataGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 693,697 ----
  		#define	disposedataGlueParamSize	(sizeof (h))
  		
! 		struct disposedataGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 707,711 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 710,714 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 718,722 ****
  		#define	canreplicateGlueParamSize	(sizeof (h))
  		
! 		struct canreplicateGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 721,725 ----
  		#define	canreplicateGlueParamSize	(sizeof (h))
  		
! 		struct canreplicateGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 735,739 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 738,742 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 746,750 ****
  		#define	catchreturnGlueParamSize	(sizeof (h))
  		
! 		struct catchreturnGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 749,753 ----
  		#define	catchreturnGlueParamSize	(sizeof (h))
  		
! 		struct catchreturnGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 763,767 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 766,770 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 774,778 ****
  		#define	getinvalrectGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct getinvalrectGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 777,781 ----
  		#define	getinvalrectGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct getinvalrectGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 793,797 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 796,800 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 804,808 ****
  		#define	geteditrectGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct geteditrectGlueGluePB {
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
--- 807,811 ----
  		#define	geteditrectGlueParamSize	(sizeof (h) + sizeof (r))
  		
! 		struct geteditrectGlueGluePB {	/* extension of ComponentParameters system type */
  			unsigned char componentFlags;
  			unsigned char componentParamSize;
***************
*** 823,827 ****
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch(&pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
--- 826,830 ----
  		
  		#if TARGET_API_MAC_CARBON == 1
! 		return  CallComponentDispatch((ComponentParameters*) &pb);
  		#else	
  		return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb);
***************
*** 934,937 ****
--- 937,942 ----
  		/*setattributesGlue*/
  	
+ 
+ #ifndef iowaRuntime
  	
  	static pascal ComponentResult geticonGlue (ComponentInstance comp, Handle *h) 
***************
*** 939,942 ****
--- 944,949 ----
  		ComponentCallNow (IOAgeticoncommand, sizeof (Handle *)); 
  		/*geticonGlue*/
+ 
+ #endif
  	
  	

[frontierkernel-commits] Frontier/FrontierSDK/Toolkits/IACTools/Source iacnetwork.c,1.2,1.3 iachandler.c,1.2,1.3

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

Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9466

Modified Files:
	iacnetwork.c iachandler.c 
Log Message:
Fixed GCC compiler warnings.

Index: iachandler.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iachandler.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iachandler.c	23 Oct 2004 21:22:35 -0000	1.2
--- iachandler.c	29 Oct 2004 20:22:23 -0000	1.3
***************
*** 22,26 ****
  	#if TARGET_API_MAC_CARBON == 1
  
! 		ec = AEInstallEventHandler (eventclass, id, NewAEEventHandlerUPP (handler), 0, false);
  	
  	#else
--- 22,26 ----
  	#if TARGET_API_MAC_CARBON == 1
  
! 		ec = AEInstallEventHandler (eventclass, id, NewAEEventHandlerUPP ((AEEventHandlerProcPtr) handler), 0, false);
  	
  	#else
***************
*** 93,98 ****
  	
  	#if TARGET_API_MAC_CARBON == 1
! 	AECoercePtrUPP	theHandler = NewAECoercePtrUPP(handler);
! 	ec = AEInstallCoercionHandler (fromtype, totype, theHandler, (long) 0, false, false);
  	//should we delete this, my gut feeling is no, not until the app ends
  	#else
--- 93,98 ----
  	
  	#if TARGET_API_MAC_CARBON == 1
! 	AECoercePtrUPP	theHandler = NewAECoercePtrUPP((AECoercePtrProcPtr) handler);
! 	ec = AEInstallCoercionHandler (fromtype, totype, (AECoercionHandlerUPP) theHandler, (long) 0, false, false);
  	//should we delete this, my gut feeling is no, not until the app ends
  	#else

Index: iacnetwork.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iacnetwork.c	23 Oct 2004 21:23:08 -0000	1.2
--- iacnetwork.c	29 Oct 2004 20:22:23 -0000	1.3
***************
*** 11,14 ****
--- 11,17 ----
  #define typeTargetID 'targ'
  
+ 
+ #if TARGET_API_MAC_OS8
+ 
  static void MakePascalStringWLen (StringPtr theDest, int theDestLen, char *theSrc, int theSrcLen) {
  	
***************
*** 29,34 ****
  
  
- #if TARGET_API_MAC_OS8
- 
  static OSErr HCProgramToPortAndLoc (char *theName, short len, LocationNameRec *theLoc, PortInfoRec *thePort) {
  	
--- 32,35 ----

[frontierkernel-commits] Frontier/Common/IOAToolkit ioapopup.c,1.2,1.3 ioacolorpopup.c,1.3,1.4 ioa.c,1.2,1.3 ioabutton.c,1.2,1.3 ioaradio.c,1.2,1.3 ioascrollbar.c,1.2,1.3

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

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

Modified Files:
	ioapopup.c ioacolorpopup.c ioa.c ioabutton.c ioaradio.c 
	ioascrollbar.c 
Log Message:
Fixed GCC compiler warnings.

Index: ioapopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapopup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioapopup.c	23 Oct 2004 21:40:49 -0000	1.2
--- ioapopup.c	29 Oct 2004 20:22:01 -0000	1.3
***************
*** 98,101 ****
--- 98,102 ----
  typedef smalliconbits *ptrsmalliconbits, **hdlsmalliconbits;
  
+ #if !TARGET_API_MAC_CARBON
  
  static boolean plotsmallicon (Rect r, short iconlist, short iconnum, boolean flinvert) {
***************
*** 104,108 ****
  	short mode;
  	BitMap bmap;
! 	WindowPtr w;
  	
  	GetPort (&w);
--- 105,109 ----
  	short mode;
  	BitMap bmap;
! 	GrafPtr w;
  	
  	GetPort (&w);
***************
*** 142,154 ****
  	return (true);
  	} /*plotsmallicon*/
- 	
- 	
- static long texthandlewidth (Handle htext) {
  
! 	return (TextWidth (*htext, 0, GetHandleSize (htext)));
! 	} /*texthandlewidth*/
! 	
! 	
! static void disposehandle (h) Handle h; {
  	
  	if (h != nil) DisposeHandle (h);
--- 143,151 ----
  	return (true);
  	} /*plotsmallicon*/
  
! #endif
! 
! 
! static void disposehandle (Handle h) {
  	
  	if (h != nil) DisposeHandle (h);
***************
*** 515,528 ****
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		bigstring bs, SInt16 depth, Boolean isColorDev) {
  		
  		/*
  		7.0b48 PBS: draw the label for a popup menu.
  		*/
  		pushstyle (geneva, 10, 0);
  
  		movepento ((*bounds).left, (*bounds).top + 12);
  		
! 		pendrawstring (bs);
  
  		popstyle ();
--- 512,528 ----
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
  		
  		/*
  		7.0b48 PBS: draw the label for a popup menu.
  		*/
+ 		
+ 		StringPtr sptr = (StringPtr) refcon;
+ 		
  		pushstyle (geneva, 10, 0);
  
  		movepento ((*bounds).left, (*bounds).top + 12);
  		
! 		pendrawstring (sptr);
  
  		popstyle ();
***************
*** 681,684 ****
--- 681,686 ----
  
  
+ #if 0
+ 
  static boolean xxxrecalcpopup (hdlobject h, boolean flmajorrecalc) {
  	
***************
*** 705,708 ****
--- 707,712 ----
  	} /*xxxrecalcpopup*/
  
+ #endif
+ 
  
  static boolean getpopupinvalrect (hdlobject h, Rect *r) {

Index: ioabutton.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioabutton.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioabutton.c	23 Oct 2004 21:39:23 -0000	1.2
--- ioabutton.c	29 Oct 2004 20:22:02 -0000	1.3
***************
*** 108,112 ****
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		Handle htext, SInt16 depth, Boolean isColorDev) {
  		
  		/*
--- 108,112 ----
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
  		
  		/*
***************
*** 114,117 ****
--- 114,118 ----
  		*/
  		
+ 		Handle htext = (Handle) refcon;
  		ThemeFontID idfont;
  		bigstring fontname, bs;

Index: ioacolorpopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ioacolorpopup.c	29 Oct 2004 00:09:35 -0000	1.3
--- ioacolorpopup.c	29 Oct 2004 20:22:02 -0000	1.4
***************
*** 94,97 ****
--- 94,99 ----
  
  
+ #if !TARGET_API_MAC_CARBON
+ 
  static void getitemrect (short item, Rect *ritem) {
  
***************
*** 142,146 ****
  	} /*frameitem*/
  	
! 	
  static pascal void colormenuhandler (short msg, MenuHandle hmenu, Rect *menurect, Point pt, short *item) {
  
--- 144,148 ----
  	} /*frameitem*/
  	
! 
  static pascal void colormenuhandler (short msg, MenuHandle hmenu, Rect *menurect, Point pt, short *item) {
  
***************
*** 270,274 ****
  	#endif
  	} /*colormenuhandler*/
! 	
  	
  static void DebugNum (long num) {
--- 272,276 ----
  	#endif
  	} /*colormenuhandler*/
! 
  	
  static void DebugNum (long num) {
***************
*** 281,285 ****
  	} /*DebugNum*/
  
- #if !TARGET_API_MAC_CARBON
  #if !GENERATINGCFM
  
--- 283,286 ----
***************
*** 477,480 ****
--- 478,483 ----
  	
  
+ #if 0
+ 
  static boolean getcheckboxeditrect (hdlobject h, Rect *r) {
  
***************
*** 485,488 ****
--- 488,493 ----
  	return (true); /*it can be edited*/
  	} /*getcheckboxeditrect*/
+ 
+ #endif
  	
  

Index: ioaradio.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaradio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioaradio.c	23 Oct 2004 21:40:59 -0000	1.2
--- ioaradio.c	29 Oct 2004 20:22:02 -0000	1.3
***************
*** 117,121 ****
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		bigstring bs, SInt16 depth, Boolean isColorDev) {
  		
  		//pushstyle (geneva, 10, 0);
--- 117,123 ----
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
! 		
! 		//StringPtr bs = (StringPtr) refcon;
  		
  		//pushstyle (geneva, 10, 0);
***************
*** 163,167 ****
  		DrawThemeButton (&r, kThemeRadioButton, &drawinfo, nil, nil, drawupp, (unsigned long) nil);
  		
- 		//DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback);
  		DisposeThemeButtonDrawUPP (drawupp);
  		}
--- 165,168 ----

Index: ioascrollbar.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioascrollbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioascrollbar.c	23 Oct 2004 21:41:20 -0000	1.2
--- ioascrollbar.c	29 Oct 2004 20:22:02 -0000	1.3
***************
*** 81,85 ****
  static boolean cleanscrollbar (hdlobject h, short textheight, short textwidth, Rect *r) {
  	
- 	hdlscrollbardata hdata = (hdlscrollbardata) (**h).objectdata;
  	short height, width;
  	
--- 81,84 ----

Index: ioa.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ioa.c	23 Oct 2004 21:39:12 -0000	1.2
--- ioa.c	29 Oct 2004 20:22:02 -0000	1.3
***************
*** 261,265 ****
  	*/
  	
! 	char len;
  	short newwidth;
  	
--- 261,265 ----
  	*/
  	
! 	long len;
  	short newwidth;
  	
***************
*** 267,271 ****
  		return;
  	
! 	len = bs [0]; /* current length in characters*/
  	
  	width -= CharWidth ('É'); /* subtract width of ellipses*/
--- 267,271 ----
  		return;
  	
! 	len = (long) bs [0]; /* current length in characters*/
  	
  	width -= CharWidth ('É'); /* subtract width of ellipses*/
***************
*** 1328,1332 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAcloseUPP  = NewComponentFunctionUPP(IOAclose, IOAcloseProcInfo);
  			result = CallComponentFunction(params, IOAcloseUPP);
  			DisposeComponentFunctionUPP(IOAcloseUPP);
--- 1328,1332 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAcloseUPP  = NewComponentFunctionUPP((ProcPtr) &IOAclose, IOAcloseProcInfo);
  			result = CallComponentFunction(params, IOAcloseUPP);
  			DisposeComponentFunctionUPP(IOAcloseUPP);
***************
*** 1342,1346 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAcandoUPP  = NewComponentFunctionUPP(IOAcando, IOAcandoProcInfo);
  			result = CallComponentFunction(params, IOAcandoUPP);
  			DisposeComponentFunctionUPP(IOAcandoUPP);
--- 1342,1346 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAcandoUPP  = NewComponentFunctionUPP((ProcPtr) &IOAcando, IOAcandoProcInfo);
  			result = CallComponentFunction(params, IOAcandoUPP);
  			DisposeComponentFunctionUPP(IOAcandoUPP);
***************
*** 1355,1359 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAversionUPP  = NewComponentFunctionUPP(IOAversion, IOAversionProcInfo);
  			result = CallComponentFunction(params, IOAversionUPP);
  			DisposeComponentFunctionUPP(IOAversionUPP);
--- 1355,1359 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP IOAversionUPP  = NewComponentFunctionUPP((ProcPtr) &IOAversion, IOAversionProcInfo);
  			result = CallComponentFunction(params, IOAversionUPP);
  			DisposeComponentFunctionUPP(IOAversionUPP);
***************
*** 1368,1372 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getconfigcommandUPP  = NewComponentFunctionUPP(getconfigcommand, getconfigcommandProcInfo);
  			result = CallComponentFunction(params, getconfigcommandUPP);
  			DisposeComponentFunctionUPP(getconfigcommandUPP);
--- 1368,1372 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getconfigcommandUPP  = NewComponentFunctionUPP((ProcPtr) &getconfigcommand, getconfigcommandProcInfo);
  			result = CallComponentFunction(params, getconfigcommandUPP);
  			DisposeComponentFunctionUPP(getconfigcommandUPP);
***************
*** 1381,1385 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP initobjectcommandUPP  = NewComponentFunctionUPP(initobjectcommand, initobjectcommandProcInfo);
  			result = CallComponentFunction(params, initobjectcommandUPP);
  			DisposeComponentFunctionUPP(initobjectcommandUPP);
--- 1381,1385 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP initobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &initobjectcommand, initobjectcommandProcInfo);
  			result = CallComponentFunction(params, initobjectcommandUPP);
  			DisposeComponentFunctionUPP(initobjectcommandUPP);
***************
*** 1394,1398 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP drawobjectcommandUPP  = NewComponentFunctionUPP(drawobjectcommand, drawobjectcommandProcInfo);
  			result = CallComponentFunction(params, drawobjectcommandUPP);
  			DisposeComponentFunctionUPP(drawobjectcommandUPP);
--- 1394,1398 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP drawobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &drawobjectcommand, drawobjectcommandProcInfo);
  			result = CallComponentFunction(params, drawobjectcommandUPP);
  			DisposeComponentFunctionUPP(drawobjectcommandUPP);
***************
*** 1407,1411 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP editobjectcommandUPP  = NewComponentFunctionUPP(editobjectcommand, editobjectcommandProcInfo);
  			result = CallComponentFunction(params, editobjectcommandUPP);
  			DisposeComponentFunctionUPP(editobjectcommandUPP);
--- 1407,1411 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP editobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &editobjectcommand, editobjectcommandProcInfo);
  			result = CallComponentFunction(params, editobjectcommandUPP);
  			DisposeComponentFunctionUPP(editobjectcommandUPP);
***************
*** 1420,1424 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP keystrokecommandUPP  = NewComponentFunctionUPP(keystrokecommand, keystrokecommandProcInfo);
  			result = CallComponentFunction(params, keystrokecommandUPP);
  			DisposeComponentFunctionUPP(keystrokecommandUPP);
--- 1420,1424 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP keystrokecommandUPP  = NewComponentFunctionUPP((ProcPtr) &keystrokecommand, keystrokecommandProcInfo);
  			result = CallComponentFunction(params, keystrokecommandUPP);
  			DisposeComponentFunctionUPP(keystrokecommandUPP);
***************
*** 1433,1437 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP idleobjectcommandUPP  = NewComponentFunctionUPP(idleobjectcommand, idleobjectcommandProcInfo);
  			result = CallComponentFunction(params, idleobjectcommandUPP);
  			DisposeComponentFunctionUPP(idleobjectcommandUPP);
--- 1433,1437 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP idleobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &idleobjectcommand, idleobjectcommandProcInfo);
  			result = CallComponentFunction(params, idleobjectcommandUPP);
  			DisposeComponentFunctionUPP(idleobjectcommandUPP);
***************
*** 1445,1449 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP clickobjectcommandUPP  = NewComponentFunctionUPP(clickobjectcommand, clickobjectcommandProcInfo);
  			result = CallComponentFunction(params, clickobjectcommandUPP);
  			DisposeComponentFunctionUPP(clickobjectcommandUPP);
--- 1445,1449 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP clickobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &clickobjectcommand, clickobjectcommandProcInfo);
  			result = CallComponentFunction(params, clickobjectcommandUPP);
  			DisposeComponentFunctionUPP(clickobjectcommandUPP);
***************
*** 1457,1461 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP cleanupobjectcommandUPP  = NewComponentFunctionUPP(cleanupobjectcommand, cleanupobjectcommandProcInfo);
  			result = CallComponentFunction(params, cleanupobjectcommandUPP);
  			DisposeComponentFunctionUPP(cleanupobjectcommandUPP);
--- 1457,1461 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP cleanupobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &cleanupobjectcommand, cleanupobjectcommandProcInfo);
  			result = CallComponentFunction(params, cleanupobjectcommandUPP);
  			DisposeComponentFunctionUPP(cleanupobjectcommandUPP);
***************
*** 1469,1473 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP recalcobjectcommandUPP  = NewComponentFunctionUPP(recalcobjectcommand, recalcobjectcommandProcInfo);
  			result = CallComponentFunction(params, recalcobjectcommandUPP);
  			DisposeComponentFunctionUPP(recalcobjectcommandUPP);
--- 1469,1473 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP recalcobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &recalcobjectcommand, recalcobjectcommandProcInfo);
  			result = CallComponentFunction(params, recalcobjectcommandUPP);
  			DisposeComponentFunctionUPP(recalcobjectcommandUPP);
***************
*** 1481,1485 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP canreplicateobjectcommandUPP  = NewComponentFunctionUPP(canreplicateobjectcommand, canreplicateobjectcommandProcInfo);
  			result = CallComponentFunction(params, canreplicateobjectcommandUPP);
  			DisposeComponentFunctionUPP(canreplicateobjectcommandUPP);
--- 1481,1485 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP canreplicateobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &canreplicateobjectcommand, canreplicateobjectcommandProcInfo);
  			result = CallComponentFunction(params, canreplicateobjectcommandUPP);
  			DisposeComponentFunctionUPP(canreplicateobjectcommandUPP);
***************
*** 1493,1497 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP catchreturncommandUPP  = NewComponentFunctionUPP(catchreturncommand, catchreturncommandProcInfo);
  			result = CallComponentFunction(params, catchreturncommandUPP);
  			DisposeComponentFunctionUPP(catchreturncommandUPP);
--- 1493,1497 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP catchreturncommandUPP  = NewComponentFunctionUPP((ProcPtr) &catchreturncommand, catchreturncommandProcInfo);
  			result = CallComponentFunction(params, catchreturncommandUPP);
  			DisposeComponentFunctionUPP(catchreturncommandUPP);
***************
*** 1505,1509 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getinvalrectcommandUPP  = NewComponentFunctionUPP(getinvalrectcommand, getinvalrectcommandProcInfo);
  			result = CallComponentFunction(params, getinvalrectcommandUPP);
  			DisposeComponentFunctionUPP(getinvalrectcommandUPP);
--- 1505,1509 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getinvalrectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &getinvalrectcommand, getinvalrectcommandProcInfo);
  			result = CallComponentFunction(params, getinvalrectcommandUPP);
  			DisposeComponentFunctionUPP(getinvalrectcommandUPP);
***************
*** 1517,1521 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP geteditrectcommandUPP  = NewComponentFunctionUPP(geteditrectcommand, geteditrectcommandProcInfo);
  			result = CallComponentFunction(params, geteditrectcommandUPP);
  			DisposeComponentFunctionUPP(geteditrectcommandUPP);
--- 1517,1521 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP geteditrectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &geteditrectcommand, geteditrectcommandProcInfo);
  			result = CallComponentFunction(params, geteditrectcommandUPP);
  			DisposeComponentFunctionUPP(geteditrectcommandUPP);
***************
*** 1529,1533 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getvaluecommandUPP  = NewComponentFunctionUPP(getvaluecommand, getvaluecommandProcInfo);
  			result = CallComponentFunction(params, getvaluecommandUPP);
  			DisposeComponentFunctionUPP(getvaluecommandUPP);
--- 1529,1533 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getvaluecommandUPP  = NewComponentFunctionUPP((ProcPtr) &getvaluecommand, getvaluecommandProcInfo);
  			result = CallComponentFunction(params, getvaluecommandUPP);
  			DisposeComponentFunctionUPP(getvaluecommandUPP);
***************
*** 1541,1545 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setvaluecommandUPP  = NewComponentFunctionUPP(setvaluecommand, setvaluecommandProcInfo);
  			result = CallComponentFunction(params, setvaluecommandUPP);
  			DisposeComponentFunctionUPP(setvaluecommandUPP);
--- 1541,1545 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setvaluecommandUPP  = NewComponentFunctionUPP((ProcPtr) &setvaluecommand, setvaluecommandProcInfo);
  			result = CallComponentFunction(params, setvaluecommandUPP);
  			DisposeComponentFunctionUPP(setvaluecommandUPP);
***************
*** 1553,1557 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setcursorcommandUPP  = NewComponentFunctionUPP(setcursorcommand, setcursorcommandProcInfo);
  			result = CallComponentFunction(params, setcursorcommandUPP);
  			DisposeComponentFunctionUPP(setcursorcommandUPP);
--- 1553,1557 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setcursorcommandUPP  = NewComponentFunctionUPP((ProcPtr) &setcursorcommand, setcursorcommandProcInfo);
  			result = CallComponentFunction(params, setcursorcommandUPP);
  			DisposeComponentFunctionUPP(setcursorcommandUPP);
***************
*** 1565,1569 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP unpackdatacommandUPP  = NewComponentFunctionUPP(unpackdatacommand, unpackdatacommandProcInfo);
  			result = CallComponentFunction(params, unpackdatacommandUPP);
  			DisposeComponentFunctionUPP(unpackdatacommandUPP);
--- 1565,1569 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP unpackdatacommandUPP  = NewComponentFunctionUPP((ProcPtr) &unpackdatacommand, unpackdatacommandProcInfo);
  			result = CallComponentFunction(params, unpackdatacommandUPP);
  			DisposeComponentFunctionUPP(unpackdatacommandUPP);
***************
*** 1577,1581 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP debugobjectcommandUPP  = NewComponentFunctionUPP(debugobjectcommand, debugobjectcommandProcInfo);
  			result = CallComponentFunction(params, debugobjectcommandUPP);
  			DisposeComponentFunctionUPP(debugobjectcommandUPP);
--- 1577,1581 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP debugobjectcommandUPP  = NewComponentFunctionUPP((ProcPtr) &debugobjectcommand, debugobjectcommandProcInfo);
  			result = CallComponentFunction(params, debugobjectcommandUPP);
  			DisposeComponentFunctionUPP(debugobjectcommandUPP);
***************
*** 1589,1593 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getattributescommandUPP  = NewComponentFunctionUPP(getattributescommand, getattributescommandProcInfo);
  			result = CallComponentFunction(params, getattributescommandUPP);
  			DisposeComponentFunctionUPP(getattributescommandUPP);
--- 1589,1593 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getattributescommandUPP  = NewComponentFunctionUPP((ProcPtr) &getattributescommand, getattributescommandProcInfo);
  			result = CallComponentFunction(params, getattributescommandUPP);
  			DisposeComponentFunctionUPP(getattributescommandUPP);
***************
*** 1601,1605 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setattributescommandUPP  = NewComponentFunctionUPP(setattributescommand, setattributescommandProcInfo);
  			result = CallComponentFunction(params, setattributescommandUPP);
  			DisposeComponentFunctionUPP(setattributescommandUPP);
--- 1601,1605 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP setattributescommandUPP  = NewComponentFunctionUPP((ProcPtr) &setattributescommand, setattributescommandProcInfo);
  			result = CallComponentFunction(params, setattributescommandUPP);
  			DisposeComponentFunctionUPP(setattributescommandUPP);
***************
*** 1613,1617 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP geticoncommandUPP  = NewComponentFunctionUPP(geticoncommand, geticoncommandProcInfo);
  			result = CallComponentFunction(params, geticoncommandUPP);
  			DisposeComponentFunctionUPP(geticoncommandUPP);
--- 1613,1617 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP geticoncommandUPP  = NewComponentFunctionUPP((ProcPtr) &geticoncommand, geticoncommandProcInfo);
  			result = CallComponentFunction(params, geticoncommandUPP);
  			DisposeComponentFunctionUPP(geticoncommandUPP);
***************
*** 1625,1629 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getcardcommandUPP  = NewComponentFunctionUPP(getcardcommand, getcardcommandProcInfo);
  			result = CallComponentFunction(params, getcardcommandUPP);
  			DisposeComponentFunctionUPP(getcardcommandUPP);
--- 1625,1629 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP getcardcommandUPP  = NewComponentFunctionUPP((ProcPtr) &getcardcommand, getcardcommandProcInfo);
  			result = CallComponentFunction(params, getcardcommandUPP);
  			DisposeComponentFunctionUPP(getcardcommandUPP);
***************
*** 1637,1641 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP packdatacommandUPP  = NewComponentFunctionUPP(packdatacommand, packdatacommandProcInfo);
  			result = CallComponentFunction(params, packdatacommandUPP);
  			DisposeComponentFunctionUPP(packdatacommandUPP);
--- 1637,1641 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP packdatacommandUPP  = NewComponentFunctionUPP((ProcPtr) &packdatacommand, packdatacommandProcInfo);
  			result = CallComponentFunction(params, packdatacommandUPP);
  			DisposeComponentFunctionUPP(packdatacommandUPP);
***************
*** 1649,1653 ****
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP disposedatacommandUPP  = NewComponentFunctionUPP(disposedatacommand, disposedatacommandProcInfo);
  			result = CallComponentFunction(params, disposedatacommandUPP);
  			DisposeComponentFunctionUPP(disposedatacommandUPP);
--- 1649,1653 ----
  			#if TARGET_API_MAC_CARBON
  			{
! 			ComponentFunctionUPP disposedatacommandUPP  = NewComponentFunctionUPP((ProcPtr) &disposedatacommand, disposedatacommandProcInfo);
  			result = CallComponentFunction(params, disposedatacommandUPP);
  			DisposeComponentFunctionUPP(disposedatacommandUPP);

[frontierkernel-commits] Frontier/FrontierSDK/Toolkits/IACTools/Source iacapps.c,1.2,1.3

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

Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3124

Modified Files:
	iacapps.c 
Log Message:
Fixed GCC compiler warnings.

Index: iacapps.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iacapps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iacapps.c	23 Oct 2004 21:20:58 -0000	1.2
--- iacapps.c	29 Oct 2004 19:58:39 -0000	1.3
***************
*** 241,245 ****
  	#if TARGET_API_MAC_CARBON == 1
  	
! 		IACwaitroutineUPP = NewAEIdleUPP (IACwaitroutine);
  	
  	#else
--- 241,245 ----
  	#if TARGET_API_MAC_CARBON == 1
  	
! 		IACwaitroutineUPP = NewAEIdleUPP ((AEIdleProcPtr) &IACwaitroutine);
  	
  	#else