From ff3580d70f6da8a131a703b4b79f46bfe37f6bda Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sat, 30 Apr 2022 23:17:46 +0200
Subject: [PATCH] Avoid circular redundant function declaration. Include
 vsrcext.h only via vsrcdefs.h, so VSRCinstance is defined.

---
 src/spicelib/analysis/span.c         | 2 +-
 src/spicelib/devices/vsrc/vsrcdefs.h | 2 ++
 src/spicelib/devices/vsrc/vsrcext.h  | 2 --
 src/spicelib/devices/vsrc/vsrcinit.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/spicelib/analysis/span.c b/src/spicelib/analysis/span.c
index 65e9511e2..86e59daa0 100644
--- a/src/spicelib/analysis/span.c
+++ b/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"
 
diff --git a/src/spicelib/devices/vsrc/vsrcdefs.h b/src/spicelib/devices/vsrc/vsrcdefs.h
index 349665dc0..15c8b6951 100644
--- a/src/spicelib/devices/vsrc/vsrcdefs.h
+++ b/src/spicelib/devices/vsrc/vsrcdefs.h
@@ -189,4 +189,6 @@ enum {
 
 /* model questions */
 
+#include "vsrcext.h"
+
 #endif /*VSRC*/
diff --git a/src/spicelib/devices/vsrc/vsrcext.h b/src/spicelib/devices/vsrc/vsrcext.h
index 0a0ace100..d41fb626c 100644
--- a/src/spicelib/devices/vsrc/vsrcext.h
+++ b/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
diff --git a/src/spicelib/devices/vsrc/vsrcinit.c b/src/spicelib/devices/vsrc/vsrcinit.c
index aae5d5990..6cd2b533d 100644
--- a/src/spicelib/devices/vsrc/vsrcinit.c
+++ b/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"