API BREAK: use a C99 bool for 'Agedgeinfo_t.conc_opp_flag'

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b949cf0fac2501f28879be6abc7c13ad5940daa..575efb0db4b88c9e26f31dc5758cfcdb9baca945 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
 - **Breaking**: The `clustnode` and `has_port` fields of the `Agnodeinfo_t`
   struct are now C99 `bool`s instead of Graphviz-specific `boolean`s.
+- **Breaking**: The `conc_opp_flag` field of the `Agedgeinfo_t` struct is now a
+  C99 `bool` instead of a Graphviz-specific `boolean`.
 - **Breaking**: Graphviz headers no longer define the constant `MAXSHORT`. A
   drop-in replacement is `SHRT_MAX` in the C standard library’s limits.h.
 - **Breaking**: Graphviz headers no lnger define `NIL` macros. A drop-in

diff --git a/lib/common/types.h b/lib/common/types.h
index eeebeb8f8b28afc468c76643f0973df1ae00adae..4e406858de7fc7a9dbf1af6b2b00aee8336299e1 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -561,7 +561,7 @@ typedef enum {NATIVEFONTS,PSFONTS,SVGFONTS} fontname_kind;
 #endif
 #ifndef NEATO_ONLY
        unsigned char showboxes;
-       boolean conc_opp_flag;
+       bool conc_opp_flag;
        short xpenalty;
        int weight;
        int cutvalue;

diff --git a/lib/dotgen/class2.c b/lib/dotgen/class2.c
index 91cbfbed5520e9588cb2ff556d0ab0aaeaa81e6a..720477f9fa40eee9b39b3a7bfab73cb30d0c2d68 100644 (file)
--- a/lib/dotgen/class2.c
+++ b/lib/dotgen/class2.c
@@ -12,6 +12,7 @@
 /* classify edges for mincross/nodepos/splines, using given ranks */
 
 #include <dotgen/dot.h>
+#include <stdbool.h>
 
 static node_t*
 label_vnode(graph_t * g, edge_t * orig)
@@ -282,7 +283,7 @@ void class2(graph_t * g)
                        && ports_eq(e, opp)) {
                        if (Concentrate) {
                            ED_edge_type(e) = IGNORED;
-                           ED_conc_opp_flag(opp) = TRUE;
+                           ED_conc_opp_flag(opp) = true;
                        } else {        /* see above.  this is getting out of hand */
                            other_edge(e);
                            merge_chain(g, e, ED_to_virt(opp), TRUE);