From 189c9f24526c7a9d7be095cdd6e60edbb5c84228 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Fri, 18 Jul 2025 14:40:53 +0100
Subject: [PATCH] ext2spice: forward declaration arguments or removal

Remove unnecessary forward declaration:
 extHierSDAttr() as ext2spice.h has prototype
---
 ext2spice/ext2hier.c  | 5 +++--
 ext2spice/ext2spice.c | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index 4e22c56a..46f49bb4 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -75,7 +75,8 @@ ESGenerateHierarchy(
     char *inName,
     int flags)
 {
-    int esHierVisit(), esMakePorts();	/* Forward declaration */
+    int esHierVisit(HierContext *hc, ClientData cdata); /* (DefFlagsData *) */
+    int esMakePorts(HierContext *hc, ClientData cdata);	/* Forward declaration (UNUSED) */
     Use u;
     Def *def;
     HierContext hc;
@@ -582,7 +583,7 @@ spcdevHierVisit(
     EFNode  *subnode, *snode, *dnode, *subnodeFlat = NULL;
     int l, w, i, parmval;
     Rect r;
-    bool subAP = FALSE, hierS, hierD, extHierSDAttr();
+    bool subAP = FALSE, hierS, hierD;
     float sdM;
     char devchar;
     bool has_model = TRUE;
diff --git a/ext2spice/ext2spice.c b/ext2spice/ext2spice.c
index 87bc155e..867205fc 100644
--- a/ext2spice/ext2spice.c
+++ b/ext2spice/ext2spice.c
@@ -116,7 +116,7 @@ const devMerge *devMergeList = NULL ;
 
 #define        atoCap(s)       ((EFCapValue)atof(s))
 
-extern void ESGenerateHierarchy();  /* forward reference */
+extern void ESGenerateHierarchy(char *inName, int flags);  /* forward reference ext2hier.c */
 
 /*
  * ----------------------------------------------------------------------------
@@ -1999,8 +1999,6 @@ spcWriteParams(
     int parmval;
     EFNode *dnode, *subnodeFlat = NULL;
 
-    bool extHierSDAttr();
-
     plist = efGetDeviceParams(EFDevTypes[dev->dev_type]);
     while (plist != NULL)
     {
@@ -2484,7 +2482,7 @@ spcdevVisit(
     DevTerm *gate, *source, *drain;
     EFNode  *subnode, *snode, *dnode, *subnodeFlat = NULL;
     int l, w, i, parmval;
-    bool subAP= FALSE, hierS, hierD, extHierSDAttr();
+    bool subAP= FALSE, hierS, hierD;
     float sdM;
     char name[12], devchar;
     bool has_model = TRUE;