From a224c7e21a283e067bb1313de5abcbd30a70a2a2 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Sat, 12 Oct 2024 13:58:41 +0100
Subject: [PATCH] GeoDisjoint() unify return type of callback to bool

GeoDisjoint() handles this as 'bool' type internally so make all
consumer call-sites consistent with this type.
---
 windows/windDisp.c | 6 +++---
 windows/windMove.c | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/windows/windDisp.c b/windows/windDisp.c
index 91b3533d..10a0958f 100644
--- a/windows/windDisp.c
+++ b/windows/windDisp.c
@@ -273,7 +273,7 @@ WindAreaChanged(w, area)
 			 */
 {
     Rect biggerArea;
-    int windChangedFunc();	/* Forward declaration. */
+    bool windChangedFunc();	/* Forward declaration. */
 
     if (w == NULL) {
         if (windSomeSeparateRedisplay) {
@@ -345,7 +345,7 @@ WindAreaChanged(w, area)
     }
 }
 
-int
+bool
 windChangedFunc(area, next)
     Rect *area;			/* Area that is still unobscured. */
     LinkedRect *next;		/* Next obscuring area. */
@@ -360,7 +360,7 @@ windChangedFunc(area, next)
 	    DBStdPaintTbl(TT_ERROR_P, PL_DRC_ERROR), (PaintUndoInfo *) NULL);
     else (void) GeoDisjoint(area, &next->r_r, windChangedFunc,
 	(ClientData) next->r_next);
-    return 0;
+    return FALSE;
 }
 
 
diff --git a/windows/windMove.c b/windows/windMove.c
index 1a715788..991fa5f5 100644
--- a/windows/windMove.c
+++ b/windows/windMove.c
@@ -556,7 +556,7 @@ WindOver(w)
  * ----------------------------------------------------------------------------
  */
 
-int
+bool
 windFindUnobscured(area, okArea)
     Rect *area;				/* Area that may be obscured. */
     Rect *okArea;			/* Modified to contain one of the
@@ -609,7 +609,7 @@ WindReframe(w, r, inside, move)
 					 * not have to be redisplayed.
 					 */
     int xmove, ymove;			/* Distance window is moving. */
-    extern int windReframeFunc();	/* Forward declaration. */
+    extern bool windReframeFunc();	/* Forward declaration. */
     clientRec *cr;
 
     cr = (clientRec *) w->w_client;
@@ -720,14 +720,14 @@ WindReframe(w, r, inside, move)
 	(*(cr->w_reposition))(w, &newFrameArea, TRUE);
 }
 
-int
+bool
 windReframeFunc(area, w)
     Rect *area;			/* Area to redisplay. */
     MagWindow *w;			/* Window in which to redisplay. */
 
 {
     WindAreaChanged(w, area);
-    return 0;
+    return FALSE;
 }
 
 /*