From 2d79e0e0ce119817f34104bfccb7ca2f8b25d653 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Thu, 18 Feb 2021 15:47:40 -0500
Subject: [PATCH] Corrected variables that set the PaintPlane routine, which
 had been changed from returning void to returning int without changing the
 type of the variable, thus causing a compiler warning.

---
 commands/CmdTZ.c   | 2 +-
 drc/DRCarray.c     | 2 +-
 drc/DRCsubcell.c   | 4 ++--
 garouter/gaTest.c  | 2 +-
 select/selCreate.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/commands/CmdTZ.c b/commands/CmdTZ.c
index a0e93833..00478dd6 100644
--- a/commands/CmdTZ.c
+++ b/commands/CmdTZ.c
@@ -1926,7 +1926,7 @@ CmdXor(w, cmd)
 
     PaintResultType	DBXORResultTbl[NP][NT][NT];
     PaintResultType	(*curPaintSave)[NT][NT];
-    void		(*curPlaneSave)();
+    int			(*curPlaneSave)();
 
     int p, t, h;
 
diff --git a/drc/DRCarray.c b/drc/DRCarray.c
index 1f44ede6..18c4d6e1 100644
--- a/drc/DRCarray.c
+++ b/drc/DRCarray.c
@@ -114,7 +114,7 @@ drcArrayFunc(scx, arg)
     ClientData drcArrayClientData;	/* Extra parameter to pass to func. */
     PaintResultType (*savedPaintTable)[NT][NT];
     PaintResultType (*savedEraseTable)[NT][NT];
-    void (*savedPaintPlane)();
+    int (*savedPaintPlane)();
 
     if ((use->cu_xlo == use->cu_xhi) && (use->cu_ylo == use->cu_yhi))
 	return 2;
diff --git a/drc/DRCsubcell.c b/drc/DRCsubcell.c
index d7b9d3af..c976a1c0 100644
--- a/drc/DRCsubcell.c
+++ b/drc/DRCsubcell.c
@@ -697,7 +697,7 @@ DRCInteractionCheck(def, area, erasebox, func, cdarg)
     int oldTiles, count, x, y, errorSaveType;
     Rect intArea, square, cliparea, subArea;
     PaintResultType (*savedPaintTable)[NT][NT];
-    void (*savedPaintPlane)();
+    int (*savedPaintPlane)();
     struct drcClientData arg;
     SearchContext scx;
 
@@ -897,7 +897,7 @@ DRCFlatCheck(use, area)
     SearchContext scx;
     void drcIncCount();
     PaintResultType (*savedPaintTable)[NT][NT];
-    void (*savedPaintPlane)();
+    int (*savedPaintPlane)();
     int drcFlatCount = 0;
 
     UndoDisable();
diff --git a/garouter/gaTest.c b/garouter/gaTest.c
index 2e9cf05d..b05cf780 100644
--- a/garouter/gaTest.c
+++ b/garouter/gaTest.c
@@ -61,7 +61,7 @@ int gaDebNoClean = 0;
 
 /* Used in the "*garoute split" command */
 PlaneMask gaSplitPlaneMask;
-void (*gaSplitPaintPlane)();
+int (*gaSplitPaintPlane)();
 Rect gaSplitArea;
 int gaSplitType;
 
diff --git a/select/selCreate.c b/select/selCreate.c
index 62b01ebf..cac59183 100644
--- a/select/selCreate.c
+++ b/select/selCreate.c
@@ -1074,7 +1074,7 @@ SelectAndCopy2(newSourceDef)
     SearchContext scx;
     Rect editArea, labelArea, expanded;
     int plane;
-    void (*savedPaintPlane)();
+    int (*savedPaintPlane)();
     extern int selACPaintFunc();	/* Forward reference. */
     extern int selACCellFunc();