Re-do some .h files to limit exposure of internal values, .h files,

and dependencies on config.h; return to a simple, concrete boolean type

diff --git a/lib/dotgen/mincross.c b/lib/dotgen/mincross.c
index d16159b9f890be136ce34837de2f53f54d8593b6..91b51343d0a180bdfbcf6657218ea2388841d73d 100644 (file)
--- a/lib/dotgen/mincross.c
+++ b/lib/dotgen/mincross.c
@@ -30,7 +30,7 @@
 #define flatindex(v)   ((v)->u.low)
 
        /* forward declarations */
-static bool medians(graph_t * g, int r0, int r1);
+static boolean medians(graph_t * g, int r0, int r1);
 static int nodeposcmpf(node_t ** n0, node_t ** n1);
 static int edgeidcmpf(edge_t ** e0, edge_t ** e1);
 static void flat_breakcycles(graph_t * g);
@@ -65,7 +65,7 @@ static graph_t *Root;
 static int GlobalMinRank, GlobalMaxRank;
 static edge_t **TE_list;
 static int *TI_list;
-static bool ReMincross;
+static boolean ReMincross;
 
 /* dot_mincross:
  * Minimize edge crossings
@@ -705,7 +705,7 @@ static void init_mincross(graph_t * g)
 static void flat_search(graph_t * g, node_t * v)
 {
     int i, j;
-    bool hascl;
+    boolean hascl;
     edge_t *e, *rev;
     adjmatrix_t *M = GD_rank(g)[ND_rank(v)].flat;
 
@@ -1031,7 +1031,7 @@ static void
 reorder(graph_t * g, int r, int reverse, int hasfixed)
 {
     int changed = 0, nelt;
-    bool muststay, sawclust;
+    boolean muststay, sawclust;
     node_t **vlist = GD_rank(g)[r].v;
     node_t **lp, **rp, **ep = vlist + GD_rank(g)[r].n;
 
@@ -1263,12 +1263,12 @@ flat_mval(node_t * n)
 
 #define VAL(node,port) (MC_SCALE * (node)->u.order + (port).order)
 
-static bool medians(graph_t * g, int r0, int r1)
+static boolean medians(graph_t * g, int r0, int r1)
 {
     int i, j, j0, lm, rm, lspan, rspan, *list;
     node_t *n, **v;
     edge_t *e;
-    bool hasfixed = FALSE;
+    boolean hasfixed = FALSE;
 
     list = TI_list;
     v = GD_rank(g)[r0].v;

diff --git a/lib/dotgen/position.c b/lib/dotgen/position.c
index 85e8a57c48098fb827ac34aec0898a8ba3dd3c9c..477e146cee812165579e51d1e0d4280622a9a33f 100644 (file)
--- a/lib/dotgen/position.c
+++ b/lib/dotgen/position.c
@@ -34,7 +34,7 @@ static void set_aspect(graph_t * g);
 static void expand_leaves(graph_t * g);
 static void make_lrvn(graph_t * g);
 static void contain_nodes(graph_t * g);
-static bool idealsize(graph_t * g, double);
+static boolean idealsize(graph_t * g, double);
 
 #ifdef DEBUG
 static void
@@ -942,7 +942,7 @@ static void set_aspect(graph_t * g)
 {
     double xf = 0.0, yf = 0.0, actual, desired;
     node_t *n;
-    bool scale_it, filled;
+    boolean scale_it, filled;
     point sz;
 
     rec_bb(g, g);
@@ -1210,9 +1210,9 @@ static void contain_nodes(graph_t * g)
 
 /* idealsize:
  * set g->drawing->size to a reasonable default.
- * returns a bool to indicate if drawing is to
+ * returns a boolean to indicate if drawing is to
  * be scaled and filled */
-static bool idealsize(graph_t * g, double minallowed)
+static boolean idealsize(graph_t * g, double minallowed)
 {
     double xf, yf, f, R;
     point b, relpage, margin;