Use more void.

19 files changed, 530 insertions, 41 deletions

diff --git a/cad/fasthenry/distinfo b/cad/fasthenry/distinfo
index 2dacb8cf80a..b7d643052e5 100644
--- a/cad/fasthenry/distinfo
+++ b/cad/fasthenry/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/07/08 15:40:58 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/12/25 21:14:17 joerg Exp $
 
 SHA1 (fasthenry-3.0.19961112/fasthenry-3.0-12Nov96.tar.Z) = 7117fdbaad95929a8d98944dced48cfb3a9e39d0
 RMD160 (fasthenry-3.0.19961112/fasthenry-3.0-12Nov96.tar.Z) = 7059c9642c2246abf8101658027df1c89b7cab74
@@ -7,12 +7,12 @@ SHA1 (patch-aa) = 0461bee57442482c1d6467c0d9caa8382016e479
 SHA1 (patch-ab) = 3d593630b697f10b1ca1528e1818ccc33c6db464
 SHA1 (patch-ac) = 0a35ee0bfdc460e8a262d5cdc1d80c5f8905340e
 SHA1 (patch-ad) = 99cc8e4331756a425ebec914aa2bfaecadba38fb
-SHA1 (patch-ae) = 7db114b252d86ba41eefbd41d6e28b48189fc5e3
-SHA1 (patch-af) = 7bb6182e48c7517d62021d9126cf38f7fca833de
-SHA1 (patch-ag) = 67173de5037f122c559e3df3a51e2b4190e5668b
-SHA1 (patch-ah) = 8bfa6687c4a18cc3f0672930b31b4ea10a1cbce7
-SHA1 (patch-ai) = cc59e269314a22dce109d78bc705dda927f3739d
-SHA1 (patch-aj) = 153d716bacea6d4e3ca342a035ad43bec5c1d308
+SHA1 (patch-ae) = f92074acf09feabb7a283cb61fd44483c1d11e75
+SHA1 (patch-af) = 1156c3bdc7caa4529e62b28620dc4dbb63502685
+SHA1 (patch-ag) = 7d2171806982b5159c620f1413fde47f0e738cb3
+SHA1 (patch-ah) = f15255b45456010d5f4ad932c71b1fe25bf93909
+SHA1 (patch-ai) = ca4ee871f77ffe9d0099d047b4cd6f0dbde638b3
+SHA1 (patch-aj) = 498faad2ef8d6ba23b36dd50c5ea612e959af99c
 SHA1 (patch-ak) = ae0e90954eeaaed0e466e23bd5cc65f55f005f32
 SHA1 (patch-al) = 989ea3eb31036dd11074585da09fb13f8dc0e121
 SHA1 (patch-am) = 0114bbc5f54a672442ddccb6a9680d941d1c623a
@@ -27,8 +27,17 @@ SHA1 (patch-au) = 6bb6f94c221d12aeb8ea3a98f9cadfb8b813e0ce
 SHA1 (patch-av) = 1e52f584d81ba7394d8f876f74fb5d639a160060
 SHA1 (patch-aw) = f3c23565502045d21518a40981c4e3170364df54
 SHA1 (patch-ax) = 0d63ac982956c51a1f731e879e3a3330fdc3e27a
-SHA1 (patch-ay) = a1bec67321d965bc28bb7ac6aa665ce736ae7960
-SHA1 (patch-az) = 0c4a7175c3623063ef1e2b45336cc17b3b294525
-SHA1 (patch-ba) = 7d123f59922c3fc2ef5e9b9d54654bfd4fc6f75d
+SHA1 (patch-ay) = 48cd809f2f0caae7b14c6e3f98a1059c95b409e8
+SHA1 (patch-az) = 38897ec7cc07866aefb96834d695b8d95dff5458
+SHA1 (patch-ba) = 3d975a6d58c4122c076a3b65005b25a894aad83f
 SHA1 (patch-bb) = e9549c67f4a0c807deb73c1284fcae7d130de0ea
 SHA1 (patch-bc) = 6a1eb5a47344e097a84754e12c80867eebf53483
+SHA1 (patch-src_fasthenry_barnoldi.c) = c49f6803237cb55c70a99c87ba581db759cdcbc7
+SHA1 (patch-src_fasthenry_gp.h) = 3460cec75d61706c1c108ce03e4ed499fb1f381f
+SHA1 (patch-src_fasthenry_induct.h) = 858f376e14ecf064944318068b21a8a631afe163
+SHA1 (patch-src_fasthenry_joelself.c) = 6c53b6bed5527c66801260856e48ef43fc133881
+SHA1 (patch-src_fasthenry_mulDo.c) = 84c6dea7910dcc55f0cacc53c75eba3c963851dd
+SHA1 (patch-src_fasthenry_mulMats.c) = 81eb6ca630ac6bf2802cfc385113baf457c2cdb7
+SHA1 (patch-src_fasthenry_mulSetup.c) = 3ddde84e061b46282c190e58228f87530e48e08b
+SHA1 (patch-src_fasthenry_read__tree.c) = d9778d793d1761ec332e2703b2d3c4ce211e7ff5
+SHA1 (patch-src_fasthenry_sparse_spDefs.h) = 8976b2192591dea7a7a24867be0e2bb4c56f60b1
diff --git a/cad/fasthenry/patches/patch-ae b/cad/fasthenry/patches/patch-ae
index 1d6e52fd027..69fcd1484f4 100644
--- a/cad/fasthenry/patches/patch-ae
+++ b/cad/fasthenry/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.4 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/contact.c.orig	Tue Aug  3 22:17:10 2004
+--- src/fasthenry/contact.c.orig	2004-08-03 22:17:10.000000000 +0000
 +++ src/fasthenry/contact.c
 @@ -45,7 +45,7 @@ operation of Software or Licensed Progra
  #include <stdio.h>
@@ -11,3 +11,15 @@ $NetBSD: patch-ae,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
  #include <math.h>
  #include "induct.h"
  
+@@ -1130,10 +1130,7 @@ contact_equiv_rect(contactp, gp, relx, r
+ /* equiv all the nodes together on the exterior of the given rectangle */
+ /* picks the closest node outside the rect along the perimeter. */
+ /* We will assume the elements on the interior don't matter */
+-make_equiv_rect(x0, y0, z0, x_width, y_width, gp, name) 
+-    double x0, y0, z0, x_width, y_width;
+-    Nonuni_gp *gp;
+-    char *name;  /* node name */
++void make_equiv_rect(double x0, double y0, double z0, double x_width, double y_width, Nonuni_gp *gp, char *name) 
+ {
+   double xl, xr, yb, yt;
+   Gcell *cell;
diff --git a/cad/fasthenry/patches/patch-af b/cad/fasthenry/patches/patch-af
index d31c5fe50d3..169c3074f4c 100644
--- a/cad/fasthenry/patches/patch-af
+++ b/cad/fasthenry/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-af,v 1.3 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/fillM.c.orig	Tue Aug  3 22:17:11 2004
+--- src/fasthenry/fillM.c.orig	2004-08-03 22:17:11.000000000 +0000
 +++ src/fasthenry/fillM.c
 @@ -34,6 +34,7 @@ operation of Software or Licensed Progra
   
@@ -10,3 +10,15 @@ $NetBSD: patch-af,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
  #include "induct.h"
  
  /* this fills the kircoff's voltage law matrix (Mesh matrix) */
+@@ -573,10 +574,7 @@ SPATH *path;
+ 
+ }
+ 
+-makegrids(indsys, Im, column, freq_num)
+-SYS *indsys;
+-CX *Im;
+-int column;
++void makegrids(SYS *indsys, CX *Im, int column, int freq_num)
+ {
+   static CX *Ib = NULL, current;
+   int fils, meshes;
diff --git a/cad/fasthenry/patches/patch-ag b/cad/fasthenry/patches/patch-ag
index 4ff92ad3c8d..d0a5f6d218f 100644
--- a/cad/fasthenry/patches/patch-ag
+++ b/cad/fasthenry/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.4 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/findpaths.c.orig	Tue Aug  3 22:17:11 2004
+--- src/fasthenry/findpaths.c.orig	2004-08-03 22:17:11.000000000 +0000
 +++ src/fasthenry/findpaths.c
 @@ -34,7 +34,7 @@ operation of Software or Licensed Progra
   
@@ -11,3 +11,13 @@ $NetBSD: patch-ag,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
  #include "induct.h"
  
  
+@@ -498,8 +498,7 @@ NODES *node;
+   return pn;
+ }
+ 
+-make_equiv(orignode, realnode)
+-NODES *orignode, *realnode;
++void make_equiv(NODES *orignode, NODES*realnode)
+ {
+   SEGLIST *segl;
+   NODES *node;
diff --git a/cad/fasthenry/patches/patch-ah b/cad/fasthenry/patches/patch-ah
index 631ac1ad20b..c2fb47559cc 100644
--- a/cad/fasthenry/patches/patch-ah
+++ b/cad/fasthenry/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.3 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/hole.c.orig	Tue Aug  3 22:17:12 2004
+--- src/fasthenry/hole.c.orig	2004-08-03 22:17:12.000000000 +0000
 +++ src/fasthenry/hole.c
-@@ -38,7 +38,7 @@ operation of Software or Licensed Progra
+@@ -38,10 +38,13 @@ operation of Software or Licensed Progra
  #include <stdio.h>
  #include <ctype.h>
  #include <string.h>
@@ -11,3 +11,21 @@ $NetBSD: patch-ah,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
  #include <math.h>
  #include "induct.h"
  
++
++static void hole_circle(HoleList *holep, GROUNDPLANE *gp, double relx, double rely, double relz, double units);
++
+ /* returns TRUE if the next word in line matches str. */
+ /* (strips leading spaces from line, but not str) */
+ is_next_word(str, line)
+@@ -313,10 +316,7 @@ double relx,rely,relz,units;
+    It takes 4 values in holep->vals.  The first three are (x,y,z) of 
+    the center and the last is the radius, R.
+ */
+-hole_circle(holep, gp, relx, rely, relz, units)
+-GROUNDPLANE *gp;
+-HoleList *holep;
+-double relx,rely,relz,units;
++static void hole_circle(HoleList *holep, GROUNDPLANE *gp, double relx, double rely, double relz, double units)
+ {
+   NODES *node1, *node2, *nodec;
+   int i1, j1, i2, j2;
diff --git a/cad/fasthenry/patches/patch-ai b/cad/fasthenry/patches/patch-ai
index cb6301345c5..98f814e3cce 100644
--- a/cad/fasthenry/patches/patch-ai
+++ b/cad/fasthenry/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.3 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/induct.c.orig	Tue Aug  3 22:17:12 2004
+--- src/fasthenry/induct.c.orig	2004-08-03 22:17:12.000000000 +0000
 +++ src/fasthenry/induct.c
 @@ -35,6 +35,7 @@ operation of Software or Licensed Progra
  *//* This is the main part of the code */
@@ -10,3 +10,36 @@ $NetBSD: patch-ai,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
  
  /* these are missing in some math.h files */
  extern double asinh();
+@@ -45,6 +46,8 @@ extern double atanh();
+ #define TIMESIZE 10
+ 
+ static int notblankline();
++static void dumpMat_totextfile(FILE *fp, double **A, int rows, int cols);
++static void cx_dumpMat_totextfile(FILE *fp, CX **Z, int rows, int cols);
+ 
+ FILE *fp, *fp2, *fp3, *fptemp, *fb, *fROM;
+ int num_exact_mutual;
+@@ -1850,10 +1853,7 @@ MELEMENT *mesh1, *mesh2;
+   }
+ }
+ 
+-cx_dumpMat_totextfile(fp, Z, rows, cols)
+-FILE *fp;
+-CX **Z;
+-int rows, cols;
++static void cx_dumpMat_totextfile(FILE *fp, CX **Z, int rows, int cols)
+ {
+   int i, j;
+ 
+@@ -1865,10 +1865,7 @@ int rows, cols;
+   return;
+ }
+ 
+-dumpMat_totextfile(fp, A, rows, cols)
+-FILE *fp;
+-double **A;
+-int rows, cols;
++static void dumpMat_totextfile(FILE *fp, double **A, int rows, int cols)
+ {
+   int i, j;
+ 
diff --git a/cad/fasthenry/patches/patch-aj b/cad/fasthenry/patches/patch-aj
index 6f47516080d..4794e9a83a7 100644
--- a/cad/fasthenry/patches/patch-aj
+++ b/cad/fasthenry/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.3 2012/12/25 21:14:17 joerg Exp $
 
---- src/fasthenry/mulGlobal.h.orig	Tue Aug  3 22:20:13 2004
+--- src/fasthenry/mulGlobal.h.orig	2004-08-03 22:20:13.000000000 +0000
 +++ src/fasthenry/mulGlobal.h
 @@ -46,7 +46,7 @@ extern char *   calloc();
  extern char *   malloc();
@@ -11,3 +11,11 @@ $NetBSD: patch-aj,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
  #endif /* end if NEWS */
  #include <stdio.h>
  #include <math.h>
+@@ -428,3 +428,7 @@ misc. global macros
+ /* blkDirect.c related flags - used only when DIRSOL == ON || EXPGCR == ON */
+ #define MAXSIZ 0		/* any more tiles than this uses matrix on disk
+ 				   for DIRSOL == ON or EXPGCR == ON */
++
++void mulUp(ssystem *sys);
++void mulDown(ssystem *sys);
++
diff --git a/cad/fasthenry/patches/patch-ay b/cad/fasthenry/patches/patch-ay
index d1e81ac205a..1b1a59231b6 100644
--- a/cad/fasthenry/patches/patch-ay
+++ b/cad/fasthenry/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1 2006/06/21 14:56:51 minskim Exp $
+$NetBSD: patch-ay,v 1.2 2012/12/25 21:14:17 joerg Exp $
 
 --- src/fasthenry/sparse/spAllocate.c.orig	2004-08-03 22:17:17.000000000 +0000
 +++ src/fasthenry/sparse/spAllocate.c
@@ -9,9 +9,41 @@ $NetBSD: patch-ay,v 1.1 2006/06/21 14:56:51 minskim Exp $
 -
 -
 -
-+static InitializeElementBlocks(MatrixPtr, int, int);
-+static RecordAllocation(MatrixPtr, char *);
-+static AllocateBlockOfAllocationList(MatrixPtr);
++static void InitializeElementBlocks(MatrixPtr, int, int);
++static void RecordAllocation(MatrixPtr, char *);
++static void AllocateBlockOfAllocationList(MatrixPtr);
  
  
  /*
+@@ -402,7 +402,7 @@ ElementPtr  pElement;
+  *  spNO_MEMORY
+  */
+ 
+-static
++static void
+ InitializeElementBlocks( Matrix, InitialNumberOfElements,
+                          NumberOfFillinsExpected )
+ 
+@@ -545,11 +545,8 @@ ElementPtr  pFillins;
+  *  spNO_MEMORY
+  */
+ 
+-static
+-RecordAllocation( Matrix, AllocatedPtr )
+-
+-MatrixPtr Matrix;
+-char  *AllocatedPtr;
++static void
++RecordAllocation( MatrixPtr Matrix, char *AllocatedPtr )
+ {
+ /* Begin `RecordAllocation'. */
+ /*
+@@ -602,7 +599,7 @@ char  *AllocatedPtr;
+  *  spNO_MEMORY
+  */
+ 
+-static
++static void
+ AllocateBlockOfAllocationList( Matrix )
+ 
+ MatrixPtr Matrix;
diff --git a/cad/fasthenry/patches/patch-az b/cad/fasthenry/patches/patch-az
index 8c7a04c483c..a2d3ad8869c 100644
--- a/cad/fasthenry/patches/patch-az
+++ b/cad/fasthenry/patches/patch-az
@@ -1,19 +1,20 @@
-$NetBSD: patch-az,v 1.1 2006/06/21 14:56:51 minskim Exp $
+$NetBSD: patch-az,v 1.2 2012/12/25 21:14:17 joerg Exp $
 
 --- src/fasthenry/sparse/spBuild.c.orig	2004-08-03 22:17:18.000000000 +0000
 +++ src/fasthenry/sparse/spBuild.c
-@@ -105,8 +105,8 @@ static char RCSid[] =
+@@ -105,8 +105,9 @@ static char RCSid[] =
  #include "spMatrix.h"
  #include "spDefs.h"
  
 -
 -
 +static void Translate(MatrixPtr, int *, int *);
-+static ExpandTranslationArrays(MatrixPtr, register int);
++static void ExpandTranslationArrays(MatrixPtr, register int);
++static void EnlargeMatrix( MatrixPtr Matrix, int  NewSize);
  
  
  
-@@ -227,7 +227,6 @@ int  Row, Col;
+@@ -227,7 +228,6 @@ int  Row, Col;
  MatrixPtr  Matrix = (MatrixPtr)eMatrix;
  RealNumber  *pElement;
  ElementPtr spcFindElementInCol();
@@ -21,3 +22,37 @@ $NetBSD: patch-az,v 1.1 2006/06/21 14:56:51 minskim Exp $
  
  /* Begin `spGetElement'. */
      ASSERT( IS_SPARSE( Matrix ) AND Row >= 0 AND Col >= 0 );
+@@ -894,9 +894,7 @@ ElementPtr  pCreatedElement, spcGetEleme
+  *      Column currently being operated upon.
+  */
+ 
+-spcLinkRows( Matrix )
+-
+-MatrixPtr Matrix;
++void spcLinkRows(MatrixPtr Matrix)
+ {
+ register  ElementPtr  pElement, *FirstInRowEntry;
+ register  ArrayOfElementPtrs  FirstInRowArray;
+@@ -944,11 +942,8 @@ register  int  Col;
+  *     The allocated size of the matrix before it is expanded.
+  */
+ 
+-static
+-EnlargeMatrix( Matrix, NewSize )
+-
+-MatrixPtr Matrix;
+-register int  NewSize;
++static void
++EnlargeMatrix( MatrixPtr Matrix, int  NewSize)
+ {
+ register int I, OldAllocatedSize = Matrix->AllocatedSize;
+ 
+@@ -1033,7 +1028,7 @@ register int I, OldAllocatedSize = Matri
+  *     The allocated size of the translation arrays before being expanded.
+  */
+ 
+-static
++static void
+ ExpandTranslationArrays( Matrix, NewSize )
+ 
+ MatrixPtr Matrix;
diff --git a/cad/fasthenry/patches/patch-ba b/cad/fasthenry/patches/patch-ba
index ce1c8acd3db..6634d36f99e 100644
--- a/cad/fasthenry/patches/patch-ba
+++ b/cad/fasthenry/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2006/06/21 14:56:51 minskim Exp $
+$NetBSD: patch-ba,v 1.2 2012/12/25 21:14:17 joerg Exp $
 
 --- src/fasthenry/sparse/spFactor.c.orig	2004-08-03 22:17:18.000000000 +0000
 +++ src/fasthenry/sparse/spFactor.c
@@ -10,9 +10,9 @@ $NetBSD: patch-ba,v 1.1 2006/06/21 14:56:51 minskim Exp $
 -
 -
 +static int FactorComplexMatrix( MatrixPtr );
-+static CreateInternalVectors( MatrixPtr );
-+static CountMarkowitz( MatrixPtr, register RealVector, int );
-+static MarkowitzProducts( MatrixPtr, int );
++static void CreateInternalVectors( MatrixPtr );
++static void CountMarkowitz( MatrixPtr, register RealVector, int );
++static void MarkowitzProducts( MatrixPtr, int );
 +static ElementPtr SearchForPivot( MatrixPtr, int, int );
 +static ElementPtr SearchForSingleton( MatrixPtr, int );
 +static ElementPtr QuicklySearchDiagonal( MatrixPtr, int );
@@ -20,15 +20,120 @@ $NetBSD: patch-ba,v 1.1 2006/06/21 14:56:51 minskim Exp $
 +static ElementPtr SearchEntireMatrix( MatrixPtr, int );
 +static RealNumber FindLargestInCol( register ElementPtr );
 +static RealNumber FindBiggestInColExclude( MatrixPtr, ElementPtr, register int );
-+static ExchangeRowsAndCols( MatrixPtr, ElementPtr, register int );
-+static ExchangeColElements( MatrixPtr, int, ElementPtr, int, ElementPtr, int );
-+static ExchangeRowElements( MatrixPtr, int, ElementPtr, int, ElementPtr, int );
-+static RealRowColElimination( MatrixPtr, ElementPtr );
-+static ComplexRowColElimination( MatrixPtr, ElementPtr );
-+static UpdateMarkowitzNumbers( MatrixPtr, ElementPtr );
++static void ExchangeRowsAndCols( MatrixPtr, ElementPtr, register int );
++static void ExchangeColElements( MatrixPtr, int, ElementPtr, int, ElementPtr, int );
++static void ExchangeRowElements( MatrixPtr, int, ElementPtr, int, ElementPtr, int );
++static void RealRowColElimination( MatrixPtr, ElementPtr );
++static void ComplexRowColElimination( MatrixPtr, ElementPtr );
++static void UpdateMarkowitzNumbers( MatrixPtr, ElementPtr );
 +static ElementPtr CreateFillin( MatrixPtr, register int, int );
 +static int MatrixIsSingular( MatrixPtr, int );
 +static int ZeroPivot( MatrixPtr, int );
  
  
  /*
+@@ -753,7 +770,7 @@ BOOLEAN *DoRealDirect, *DoCmplxDirect;
+  *  spNO_MEMORY
+  */
+ 
+-static
++static void
+ CreateInternalVectors( Matrix )
+ 
+ MatrixPtr  Matrix;
+@@ -842,7 +859,7 @@ int  Size;
+  *     The size of the matrix.
+  */
+ 
+-static
++static void
+ CountMarkowitz( Matrix, RHS, Step )
+ 
+ MatrixPtr Matrix;
+@@ -952,7 +969,7 @@ int  ExtRow;
+  *      The size of the matrix.
+  */
+ 
+-static
++static void
+ MarkowitzProducts( Matrix, Step )
+ 
+ MatrixPtr Matrix;
+@@ -2109,7 +2126,7 @@ RealNumber  Largest, Magnitude;
+  *      of the reduced submatrix.
+  */
+ 
+-static
++static void
+ ExchangeRowsAndCols( Matrix, pPivot, Step )
+ 
+ MatrixPtr Matrix;
+@@ -2239,10 +2256,7 @@ ElementPtr spcFindElementInCol();
+  *      Pointer to the element in Row2 to be exchanged.
+  */
+ 
+-spcRowExchange( Matrix, Row1, Row2 )
+-
+-MatrixPtr Matrix;
+-int  Row1, Row2;
++void spcRowExchange( MatrixPtr Matrix, int Row1, int Row2 )
+ {
+ register  ElementPtr  Row1Ptr, Row2Ptr;
+ int  Column;
+@@ -2340,10 +2354,7 @@ ElementPtr  Element1, Element2;
+  *      Pointer to the element in Col2 to be exchanged.
+  */
+ 
+-spcColExchange( Matrix, Col1, Col2 )
+-
+-MatrixPtr Matrix;
+-int  Col1, Col2;
++void spcColExchange( MatrixPtr Matrix, int Col1, int Col2 )
+ {
+ register  ElementPtr  Col1Ptr, Col2Ptr;
+ int  Row;
+@@ -2446,7 +2457,7 @@ ElementPtr  Element1, Element2;
+  *      Pointer used to traverse the column.
+  */
+ 
+-static
++static void
+ ExchangeColElements( Matrix, Row1, Element1, Row2, Element2, Column )
+ 
+ MatrixPtr Matrix;
+@@ -2588,7 +2599,7 @@ register  ElementPtr  pElement;
+  *      Pointer used to traverse the row.
+  */
+ 
+-static
++static void
+ ExchangeRowElements( Matrix, Col1, Element1, Col2, Element2, Row )
+ 
+ MatrixPtr Matrix;
+@@ -2723,7 +2734,7 @@ register   ElementPtr  pElement;
+  *  spNO_MEMORY
+  */
+ 
+-static
++static void
+ RealRowColElimination( Matrix, pPivot )
+ 
+ MatrixPtr Matrix;
+@@ -2812,7 +2823,7 @@ extern ElementPtr  CreateFillin();
+  *  spNO_MEMORY
+  */
+ 
+-static
++static void
+ ComplexRowColElimination( Matrix, pPivot )
+ 
+ MatrixPtr Matrix;
+@@ -2896,7 +2907,7 @@ ElementPtr  CreateFillin();
+  *      Points to matrix element in lower triangular row.
+  */
+ 
+-static
++static void
+ UpdateMarkowitzNumbers( Matrix, pPivot )
+ 
+ MatrixPtr Matrix;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_barnoldi.c b/cad/fasthenry/patches/patch-src_fasthenry_barnoldi.c
new file mode 100644
index 00000000000..490bedaece4
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_barnoldi.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_fasthenry_barnoldi.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/barnoldi.c.orig	2012-12-25 16:13:50.000000000 +0000
++++ src/fasthenry/barnoldi.c
+@@ -458,14 +458,9 @@ dumpROM(fp, Ar, Br, Cr, Dr, size, numinp
+  *
+  *****************************************************************************/
+ 
+-dumpROMequiv_circuit(fp, Ar, Br, Cr, Dr, size, numinp, numout, title, suffix,
+-                     indsys)
+-  FILE *fp;
+-  double **Ar, **Br, **Cr, **Dr;
+-  int size, numinp, numout;
+-  char *title;
+-  char *suffix;
+-  SYS *indsys;
++void dumpROMequiv_circuit(FILE *fp, double **Ar, double **Br, double **Cr,
++    double **Dr, int size, int numinp, int numout, char *title, char *suffix,
++    SYS *indsys)
+ {
+   
+   int i,j;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_gp.h b/cad/fasthenry/patches/patch-src_fasthenry_gp.h
new file mode 100644
index 00000000000..8a23c65351e
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_gp.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_fasthenry_gp.h,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/gp.h.orig	2012-12-25 16:21:13.000000000 +0000
++++ src/fasthenry/gp.h
+@@ -323,4 +323,6 @@ Gcell *pick_cell_based_on_vec();
+ /* return opposite direction to dir */
+ #define opposite_dir(dir) ( (dir + 2)%4 )
+ 
++void make_equiv_rect(double x0, double y0, double z0, double x_width, double y_width, Nonuni_gp *gp, char *name);
++
+ #endif /* _GP_H */
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_induct.h b/cad/fasthenry/patches/patch-src_fasthenry_induct.h
new file mode 100644
index 00000000000..9d904de9055
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_induct.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_fasthenry_induct.h,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/induct.h.orig	2004-08-03 22:19:39.000000000 +0000
++++ src/fasthenry/induct.h
+@@ -654,4 +654,12 @@ extern int realComputePsi();
+ /* SHELLS preconditioner shift */
+ double shift_mutual();
+ 
++void make_equiv(NODES *orignode, NODES*realnode);
++void makegrids(SYS *indsys, CX *Im, int column, int freq_num);
++void dumpROMequiv_circuit(FILE *fp, double **Ar, double **Br, double **Cr,
++    double **Dr, int size, int numinp, int numout, char *title, char *suffix,
++    SYS *indsys);
++void mulMatUp(ssystem *sys);
++void put_in_table(FILAMENT *fil_j, FILAMENT *fil_m, int whperp, double mutterm, double *dims, int dim_count, Table **lastptr, int num_dims);
++
+ #endif
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_joelself.c b/cad/fasthenry/patches/patch-src_fasthenry_joelself.c
new file mode 100644
index 00000000000..a7724dc5a0b
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_joelself.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_fasthenry_joelself.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/joelself.c.orig	2012-12-25 16:34:10.000000000 +0000
++++ src/fasthenry/joelself.c
+@@ -682,13 +682,7 @@ Table ***ret_lastptr, **a_table;
+   return 0;
+ }
+       
+-put_in_table(fil_j, fil_m, whperp, mutterm, dims, dim_count, lastptr, num_dims)
+-FILAMENT *fil_j, *fil_m;
+-int whperp;
+-double mutterm;
+-double *dims;
+-int dim_count, num_dims;
+-Table **lastptr;
++void put_in_table(FILAMENT *fil_j, FILAMENT *fil_m, int whperp, double mutterm, double *dims, int dim_count, Table **lastptr, int num_dims)
+ {
+   Table *entry;
+   int i;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_mulDo.c b/cad/fasthenry/patches/patch-src_fasthenry_mulDo.c
new file mode 100644
index 00000000000..4f34e7d395a
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_mulDo.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_fasthenry_mulDo.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/mulDo.c.orig	2012-12-25 16:15:21.000000000 +0000
++++ src/fasthenry/mulDo.c
+@@ -151,8 +151,7 @@ int type;
+ /* 
+ Loop through upward pass. 
+ */
+-mulUp(sys)
+-ssystem *sys;
++void mulUp(ssystem *sys)
+ {
+ int i, j, k, l;
+ int msize;
+@@ -233,8 +232,7 @@ ssystem *sys;
+ /* 
+ Loop through downward pass. 
+ */
+-mulDown(sys)
+-ssystem *sys;
++void mulDown(ssystem *sys)
+ {
+   cube *nc;
+   int depth, i, j, k, lsize;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_mulMats.c b/cad/fasthenry/patches/patch-src_fasthenry_mulMats.c
new file mode 100644
index 00000000000..0d6dc022f24
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_mulMats.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_fasthenry_mulMats.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/mulMats.c.orig	2012-12-25 16:36:50.000000000 +0000
++++ src/fasthenry/mulMats.c
+@@ -718,8 +718,7 @@ children's multipoles or charges. Note t
+ multipole to multipole matrices is computed per level by exploiting the
+ uniform break-up of three-space (ie many shifts have similar geometries).  
+ */
+-mulMatUp(sys) 
+-ssystem *sys; 
++void mulMatUp(ssystem *sys)
+ {
+ cube *nextc, *kid;
+ int i, j, numterms, depth, order = sys->order;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_mulSetup.c b/cad/fasthenry/patches/patch-src_fasthenry_mulSetup.c
new file mode 100644
index 00000000000..3e648d681e7
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_mulSetup.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_fasthenry_mulSetup.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/mulSetup.c.orig	2012-12-25 16:10:33.000000000 +0000
++++ src/fasthenry/mulSetup.c
+@@ -37,6 +37,8 @@ operation of Software or Licensed Progra
+ /* big changes for induct.c 7/2/92 */
+ #include "induct.h"
+ 
++static void getnbrs(ssystem *sys);
++
+ cube *cstack[1024];		/* Stack used in several routines. */
+ 
+ /*
+@@ -932,8 +934,7 @@ int num_lexact, num_mexact;
+ Find all the nearest neighbors.
+ At the bottom level, get neighbors due to a parents being exact.
+ */
+-getnbrs(sys)
+-ssystem *sys;
++static void getnbrs(ssystem *sys)
+ {
+ cube *nc, *np, *****cubes = sys->cubes;
+ int depth = sys->depth;
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_read__tree.c b/cad/fasthenry/patches/patch-src_fasthenry_read__tree.c
new file mode 100644
index 00000000000..28b0d09ebb2
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_read__tree.c
@@ -0,0 +1,57 @@
+$NetBSD: patch-src_fasthenry_read__tree.c,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/read_tree.c.orig	2012-12-25 16:18:18.000000000 +0000
++++ src/fasthenry/read_tree.c
+@@ -44,6 +44,11 @@ operation of Software or Licensed Progra
+   
+ #define MAXLINE 1000
+ 
++static void replace_node(G_nodes *old_node, G_nodes *new_node);
++static void dump_leaf_cells_to_file(Gcell *cell, char *fname);
++static void compute_z_fils(Nonuni_gp *gp);
++static void remove_and_free(G_nodes *node);
++
+ process_plane(grndp, fp, indsys)
+      GROUNDPLANE *grndp;
+      FILE *fp;
+@@ -929,8 +934,7 @@ combine_nodes(leafcell, leafdir, fareast
+ 
+ /* replace the cell's node in the node_dir direction with new node
+    */
+-replace_node(old_node, new_node)
+-     G_nodes *new_node, *old_node;
++static void replace_node(G_nodes *old_node, G_nodes *new_node)
+ {
+   int i;
+ 
+@@ -1015,8 +1019,7 @@ delete_dead_nodes(gp)
+   }
+ }
+ 
+-remove_and_free(node)
+-     G_nodes *node;
++static void remove_and_free(G_nodes *node)
+ {
+ 
+   if (node->prev != NULL)
+@@ -1140,8 +1143,7 @@ G_nodes *get_other_gnode(cell, edge_dir,
+   
+ }
+ 
+-compute_z_fils(gp)
+-     Nonuni_gp *gp;
++static void compute_z_fils(Nonuni_gp *gp)
+ {
+   double *z_c, *thick, *z_pts, thickness;
+   int num_z_pts;
+@@ -1704,9 +1706,7 @@ debug_func()
+   i = 0;
+ }
+ 
+-dump_leaf_cells_to_file(cell, fname)
+-     Gcell *cell;
+-     char *fname;
++static void dump_leaf_cells_to_file(Gcell *cell, char *fname)
+ {
+   FILE *fp;
+ 
diff --git a/cad/fasthenry/patches/patch-src_fasthenry_sparse_spDefs.h b/cad/fasthenry/patches/patch-src_fasthenry_sparse_spDefs.h
new file mode 100644
index 00000000000..b31f636ae34
--- /dev/null
+++ b/cad/fasthenry/patches/patch-src_fasthenry_sparse_spDefs.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_fasthenry_sparse_spDefs.h,v 1.1 2012/12/25 21:14:17 joerg Exp $
+
+--- src/fasthenry/sparse/spDefs.h.orig	2012-12-25 16:24:07.000000000 +0000
++++ src/fasthenry/sparse/spDefs.h
+@@ -462,14 +462,7 @@ operation of Software or Licensed Progra
+  * MEMORY ALLOCATION
+  */
+ 
+-extern char *malloc(), *calloc(), *realloc();
+-#ifdef ultrix
+-    extern void free();
+-    extern void abort();
+-#else
+-    extern free();
+-    extern abort();
+-#endif
++#include <stdlib.h>
+ 
+ #define ALLOC(type,number)  ((type *)malloc((unsigned)(sizeof(type)*(number))))
+ #define REALLOC(ptr,type,number)  \
+@@ -909,3 +902,7 @@ struct  MatrixFrame
+     struct FillinListNodeStruct *LastFillinListNode;
+ };
+ typedef  struct MatrixFrame  *MatrixPtr;
++
++void spcLinkRows(MatrixPtr Matrix);
++void spcRowExchange( MatrixPtr Matrix, int Row1, int Row2 );
++void spcColExchange( MatrixPtr Matrix, int Col1, int Col2 );