From 742186b44f2a70111b73b60bdeb1b93993589d39 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Fri, 20 Aug 2004 09:44:08 +0000
Subject: [PATCH] Trimmed include file and removed some warnings.

---
 src/include/cktdefs.h            | 8 ++++----
 src/include/dgen.h               | 5 +++++
 src/include/ftedebug.h           | 4 ++++
 src/include/missing_math.h       | 4 ++++
 src/include/noisedef.h           | 3 ---
 src/include/sensdefs.h           | 7 ++++---
 src/spicelib/analysis/ckt.h      | 2 +-
 src/spicelib/analysis/ckti2nod.c | 2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h
index d517b54de..e6f7963d7 100644
--- a/src/include/cktdefs.h
+++ b/src/include/cktdefs.h
@@ -30,7 +30,6 @@ extern int DEVmaxnum;	/* Not sure if still used */
 #include "noisedef.h"
 
 
-
 typedef struct sCKTnode {
     IFuid name;
     int type;
@@ -58,7 +57,6 @@ typedef struct sCKTnode {
 
 typedef struct {
 
-
 /* gtri - begin - wbk - change declaration to allow dynamic sizing */
 
 /* An associated change is made in CKTinit.c to alloc the space */
@@ -300,7 +298,7 @@ extern int CKTfndTask( void *, void **, IFuid  );
 extern int CKTground( void *, void **, IFuid );
 extern int CKTic( CKTcircuit *);
 extern int CKTinit( void **);
-extern int CKTinst2Node( void *, void *, int , void **, IFuid *);
+extern int CKTinst2Node( void *, void *, int , CKTnode **, IFuid *);
 extern int CKTlinkEq(CKTcircuit*,CKTnode*);
 extern int CKTload( CKTcircuit *);
 extern int CKTmapNode( void *, void **, IFuid );
@@ -349,7 +347,7 @@ extern int DCOaskQuest( CKTcircuit *, void *, int , IFvalue *);
 extern int DCOsetParm( CKTcircuit  *, void *, int , IFvalue *);
 extern int DCTaskQuest( CKTcircuit *, void *, int , IFvalue *);
 extern int DCTsetParm( CKTcircuit  *, void *, int , IFvalue *);
-extern int DCop( CKTcircuit *, int ); /* va: int avoids "init from incompatible pointer type" */ 
+extern int DCop( CKTcircuit *ckt, int notused); /* va: notused avoids "init from incompatible pointer type" */
 extern int DCtrCurv( CKTcircuit *, int );
 extern int DCtran( CKTcircuit *, int );
 extern int DISTOan(CKTcircuit *, int);
@@ -370,6 +368,8 @@ extern int TFsetParm( CKTcircuit *, void *, int , IFvalue *);
 extern int TRANaskQuest( CKTcircuit *, void *, int , IFvalue *);
 extern int TRANsetParm( CKTcircuit *, void *, int , IFvalue *);
 extern int TRANinit(CKTcircuit *, JOB *);
+extern int NaskQuest(CKTcircuit *, void *, int, IFvalue *);
+extern int NsetParm(CKTcircuit *, void *, int, IFvalue *);
 extern int NIacIter( CKTcircuit * );
 extern int NIcomCof( CKTcircuit * ); 
 extern int NIconvTest(CKTcircuit * );
diff --git a/src/include/dgen.h b/src/include/dgen.h
index c21c0f67d..041de4d64 100644
--- a/src/include/dgen.h
+++ b/src/include/dgen.h
@@ -1,3 +1,6 @@
+#ifndef DGEN_H
+#define DGEN_H
+
 typedef struct st_dgen dgen;
 
 struct st_dgen {
@@ -24,3 +27,5 @@ struct st_dgen {
 #define	DGEN_ALLPARAMS	0x002
 
 extern	dgen	*dgen_init( );
+
+#endif /* DGEN_H */
diff --git a/src/include/ftedebug.h b/src/include/ftedebug.h
index 32914586a..0ca464b9d 100644
--- a/src/include/ftedebug.h
+++ b/src/include/ftedebug.h
@@ -3,6 +3,9 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
 **********/
 
+#ifndef FTEDEBUG_H
+#define FTEDEBUG_H
+
 /*
  *
  * Stuff for debugging a spice run. Debugging information will be printed
@@ -46,3 +49,4 @@ struct dbcomm {
     struct dbcomm *db_next; /* List of active debugging commands. */
 } ;
 
+#endif /* FTEDEBUG_H */
diff --git a/src/include/missing_math.h b/src/include/missing_math.h
index 85218b50e..80727a82d 100644
--- a/src/include/missing_math.h
+++ b/src/include/missing_math.h
@@ -19,3 +19,7 @@ extern double logb(double);
 extern double scalb(double, int);
 #endif
 #endif
+
+#ifndef HAVE_ISNAN
+extern int isnan(double);
+#endif
diff --git a/src/include/noisedef.h b/src/include/noisedef.h
index db5452082..793fe584d 100644
--- a/src/include/noisedef.h
+++ b/src/include/noisedef.h
@@ -121,7 +121,4 @@ typedef struct {
                                /* (see MAXVLENGTH in FTE/writedata.c) */
 
 
-
-extern int NsetParm();
-extern int NaskQuest();
 #endif /*NOISEDEFS*/
diff --git a/src/include/sensdefs.h b/src/include/sensdefs.h
index 3bf453513..7d7042cf4 100644
--- a/src/include/sensdefs.h
+++ b/src/include/sensdefs.h
@@ -66,9 +66,10 @@ struct st_devsenlist {
 	ModSenList	*first;
 };
 
-extern int SENSask( );
-extern int SENSsetParam( );
-extern int sens_sens( );
+/* va, with prototypes */
+extern int SENSask(CKTcircuit *,void *,int ,IFvalue *);
+extern int SENSsetParam(CKTcircuit *,void *,int ,IFvalue *);
+extern int sens_sens(CKTcircuit *,int);
 
 #define	SENS_POS			2
 #define	SENS_NEG			3
diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h
index 71ae8d765..38c4ac627 100644
--- a/src/spicelib/analysis/ckt.h
+++ b/src/spicelib/analysis/ckt.h
@@ -43,7 +43,7 @@ int CKTfndTask( void *, void **, IFuid  );
 int CKTground( void *, void **, IFuid );
 int CKTic( CKTcircuit *);
 int CKTinit( void **);
-int CKTinst2Node( void *, void *, int , void **, IFuid *);
+int CKTinst2Node( void *, void *, int , CKTnode **, IFuid *);
 int CKTlinkEq(CKTcircuit*,CKTnode*);
 int CKTload( CKTcircuit *);
 int CKTmapNode( void *, void **, IFuid );
diff --git a/src/spicelib/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c
index 003842d52..09c768dfa 100644
--- a/src/spicelib/analysis/ckti2nod.c
+++ b/src/spicelib/analysis/ckti2nod.c
@@ -22,7 +22,7 @@ Author: 1985 Thomas L. Quarles
 extern SPICEdev **DEVices;
 
 int
-CKTinst2Node(void *ckt, void *instPtr, int terminal, void **node, IFuid *nodeName)
+CKTinst2Node(void *ckt, void *instPtr, int terminal, CKTnode **node, IFuid *nodeName)
 {
     int nodenum;
     int type;