From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 27 Dec 2021 02:42:24 +0000 (-0800)
Subject: spline_edges0: take a C99 bool instead of a boolean
X-Git-Tag: 3.0.0~91^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaad07b4f4c81f73d35a5e0f6c04bdc4f1c27b4c;p=graphviz

spline_edges0: take a C99 bool instead of a boolean
---

diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c
index be580b903..82cc8a90a 100644
--- a/lib/neatogen/neatoinit.c
+++ b/lib/neatogen/neatoinit.c
@@ -595,7 +595,7 @@ int init_nop(Agraph_t * g, int adjust)
 	    posEdges = NoEdges;
 	}
 	if (posEdges != AllEdges)
-	    spline_edges0(g, FALSE);   /* add edges */
+	    spline_edges0(g, false);   /* add edges */
 	else
 	    State = GVSPLINES;
     }
@@ -1400,7 +1400,7 @@ addCluster (graph_t* g)
 static void doEdges(Agraph_t* g)
 {
     compute_bb(g);
-    spline_edges0(g, TRUE);
+    spline_edges0(g, true);
 }
 
 /* neato_layout:
diff --git a/lib/neatogen/neatoprocs.h b/lib/neatogen/neatoprocs.h
index e2b8b0a8d..7c5cae25c 100644
--- a/lib/neatogen/neatoprocs.h
+++ b/lib/neatogen/neatoprocs.h
@@ -58,7 +58,7 @@ extern "C" {
     NEATOPROCS_API void solve_model(graph_t *, int);
     NEATOPROCS_API int solveCircuit(int nG, double **Gm, double **Gm_inv);
     NEATOPROCS_API void spline_edges(Agraph_t *);
-    NEATOPROCS_API void spline_edges0(Agraph_t *, boolean);
+    NEATOPROCS_API void spline_edges0(Agraph_t *, bool);
     NEATOPROCS_API int spline_edges1(graph_t * g, int);
     NEATOPROCS_API int splineEdges(graph_t *,
 			   int (*edgefn) (graph_t *, expand_t*, int), int);
diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c
index da1c6eb89..77ed4779e 100644
--- a/lib/neatogen/neatosplines.c
+++ b/lib/neatogen/neatosplines.c
@@ -763,8 +763,7 @@ int spline_edges1(graph_t * g, int edgetype)
  * when output in dot or plain format.
  *
  */
-void spline_edges0(graph_t * g, boolean set_aspect)
-{
+void spline_edges0(graph_t *g, bool set_aspect) {
     int et = EDGE_TYPE (g);
     if (set_aspect) neato_set_aspect(g);
     if (et == EDGETYPE_NONE) return;
@@ -814,7 +813,7 @@ void spline_edges(graph_t * g)
     }
 	
     shiftClusters (g, GD_bb(g).LL);
-    spline_edges0(g, TRUE);
+    spline_edges0(g, true);
 }
 
 /* scaleEdge:
diff --git a/lib/osage/osageinit.c b/lib/osage/osageinit.c
index 1f8b78459..498649763 100644
--- a/lib/osage/osageinit.c
+++ b/lib/osage/osageinit.c
@@ -17,6 +17,7 @@
 #include    <osage/osage.h>
 #include    <neatogen/neatoprocs.h>
 #include    <pack/pack.h>
+#include    <stdbool.h>
 
 #define CL_CHUNK 10
 #define DFLT_SZ  18
@@ -360,7 +361,7 @@ void osage_layout(Agraph_t *g)
 	    ND_pos(n)[0] = PS2INCH(ND_coord(n).x);
 	    ND_pos(n)[1] = PS2INCH(ND_coord(n).y);
 	}
-	spline_edges0(g, TRUE);
+	spline_edges0(g, true);
     }
     else {
 	int et = EDGE_TYPE (g);