- Fix build with gcc4.1

PR:		ports/104109
Submitted by:	trasz <trasz@pin.if.uz.zgora.pl>

3 files changed, 43 insertions, 11 deletions

diff --git a/cad/spice/files/patch-src-lib-mfb-mfbcaps.c b/cad/spice/files/patch-src-lib-mfb-mfbcaps.c
new file mode 100644
index 000000000000..cfa187458d4b
--- /dev/null
+++ b/cad/spice/files/patch-src-lib-mfb-mfbcaps.c
@@ -0,0 +1,14 @@
+--- src/lib/mfb/mfbcaps.c.orig	Sat Oct  7 15:56:38 2006
++++ src/lib/mfb/mfbcaps.c	Sat Oct  7 15:57:51 2006
+@@ -43,9 +43,9 @@
+ 
+ FILE   *POpen();
+ char   *strcpy();
+-char   *MFBSkip();
++static char   *MFBSkip();
+ char   *MFBGetStr();
+-char   *MFBCapDecod();
++static char   *MFBCapDecod();
+ int    MFBGetNum();
+ int    MFBGetFlag();
+ int    MFBGetEnt();
diff --git a/cad/spice/files/patch-src_lib_fte_graf_c b/cad/spice/files/patch-src_lib_fte_graf_c
index 1b87553b75f8..608c0274bd57 100644
--- a/cad/spice/files/patch-src_lib_fte_graf_c
+++ b/cad/spice/files/patch-src_lib_fte_graf_c
@@ -1,6 +1,15 @@
---- src/lib/fte/graf.c.orig	Tue Jan  5 16:43:44 1993
-+++ src/lib/fte/graf.c	Thu Jul 17 12:16:42 2003
-@@ -289,9 +289,11 @@
+--- src/lib/fte/graf.c.orig	Tue Jan  5 22:43:44 1993
++++ src/lib/fte/graf.c	Sat Oct  7 16:02:45 2006
+@@ -48,6 +48,8 @@
+ static char *ticlist = ticbuf;
+ #define MAXTICS 100
+ double *readtics();
++static gr_resize_internal();
++static drawlegend();
+ 
+ #define XFACTOR 2       /* How much to expand the X scale during iplot. */
+ #define YFACTOR 1.5     /* How much to expand the Y scale during iplot. */
+@@ -289,9 +291,11 @@
  		if (*tics == (double) np) {
  		    Text("x", (int) (tox - currentgraph->fontwidth / 2),
  			(int) (toy - currentgraph->fontheight / 2));
@@ -14,7 +23,7 @@
  		    break;
  		}
  	    }
-@@ -301,9 +303,11 @@
+@@ -301,9 +305,11 @@
  	    /* Draw an 'x' */
  	    Text("x", (int) (tox - currentgraph->fontwidth / 2),
  		(int) (toy - currentgraph->fontheight / 2));
diff --git a/cad/spice/files/patch-src_lib_fte_grid_c b/cad/spice/files/patch-src_lib_fte_grid_c
index 7521d0460c42..2429c48c10f8 100644
--- a/cad/spice/files/patch-src_lib_fte_grid_c
+++ b/cad/spice/files/patch-src_lib_fte_grid_c
@@ -1,6 +1,15 @@
---- src/lib/fte/grid.c.orig	Sun Apr 25 16:53:11 1993
-+++ src/lib/fte/grid.c	Thu Jul 17 00:47:51 2003
-@@ -1230,7 +1230,10 @@
+--- src/lib/fte/grid.c.orig	Sun Apr 25 23:53:11 1993
++++ src/lib/fte/grid.c	Sat Oct  7 16:00:37 2006
+@@ -26,6 +26,8 @@
+ static void arcset();
+ static double cliparc();
+ static void adddeglabel(), addradlabel();
++static drawloggrid();
++static drawlingrid();
+ 
+ typedef enum { x_axis, y_axis } Axis;
+ 
+@@ -1230,7 +1232,10 @@
  
      /* SetLinestyle(1); takes too long */
      /* Problems with Suns on very large radii && linestyle */
@@ -12,7 +21,7 @@
  
      /* Now plot all the arc sets.  Go as high as 5 times the radius that
       * will fit on the screen.  The base magnitude is one more than 
-@@ -1409,7 +1412,10 @@
+@@ -1409,7 +1414,10 @@
      /* Let's be lazy and just draw everything -- we won't get called too
       * much and the circles get clipped anyway...
       */
@@ -24,7 +33,7 @@
  
      cliparc((double) (centx + xoffset + radoff - rad),
  	    (double) (centy + yoffset), rad, 2*angle,
-@@ -1424,7 +1430,10 @@
+@@ -1424,7 +1432,10 @@
              M_PI - 2 * angle, centx, centy, maxrad, 0);
  
      /* Draw the upper and lower circles.  */
@@ -36,7 +45,7 @@
      aclip = cliparc((double) (centx + xoffset + radoff),
  	    (double) (centy + yoffset + irad), irad,
  	    (double) (M_PI * 1.5 + 2 * iangle),
-@@ -1441,7 +1450,10 @@
+@@ -1441,7 +1452,10 @@
  	adddeglabel(graph, ndeg, xlab, ylab,
  	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);
   */
@@ -48,7 +57,7 @@
  	}
      }
      aclip = cliparc((double) (centx + xoffset + radoff),
-@@ -1455,7 +1467,10 @@
+@@ -1455,7 +1469,10 @@
  	SetColor(1);
  	adddeglabel(graph, ndeg, xlab, ylab,
  	    gr_xcenter, gr_ycenter, gr_xcenter, gr_ycenter);