Avoid circular redundant function declaration.

Include vsrcext.h only via vsrcdefs.h, so VSRCinstance is defined.

src/spicelib/analysis/span.c

@@ -23,7 +23,7 @@
 
 
 #ifdef RFSPICE
-#include "vsrc/vsrcext.h"
+#include "vsrc/vsrcdefs.h"
 #include "../maths/dense/dense.h"
 #include "../maths/dense/denseinlines.h"
 

src/spicelib/devices/vsrc/vsrcdefs.h

@@ -189,4 +189,6 @@ enum {
 
 /* model questions */
 
+#include "vsrcext.h"
+
 #endif /*VSRC*/

src/spicelib/devices/vsrc/vsrcext.h

@@ -18,8 +18,6 @@ extern int VSRCpzSetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
 extern int VSRCtemp(GENmodel*,CKTcircuit*);
 #ifdef RFSPICE
 extern int VSRCspupdate(GENmodel*, CKTcircuit*);
-#include "vsrcdefs.h"
-
 extern int VSRCgetActivePorts(GENmodel* inModel, CKTcircuit* ckt, VSRCinstance** ports);
 extern int VSRCspinit(GENmodel* inModel, CKTcircuit* ckt, CMat* zref, CMat* gn, CMat* gninv);
 #endif

src/spicelib/devices/vsrc/vsrcinit.c

@@ -3,7 +3,7 @@
 #include "ngspice/devdefs.h"
 
 #include "vsrcitf.h"
-#include "vsrcext.h"
+#include "vsrcdefs.h"
 #include "vsrcinit.h"