API BREAK: use a C99 bool for 'ignoreSwap' instead of a boolean

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0df30f6c679d0c1eb42db6101db9b2ad29935c9..fccf2bc67c5c1a354cb37bd78adca5ff0108cf78 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   Graphviz-specific `boolean`.
 - **Breaking**: The `swapEnds` and `splineMerge` members of the `splineInfo`
   struct must now be pointers to functions returning a C99 `bool`s instead of
-  Graphviz-specific `boolean`s.
+  Graphviz-specific `boolean`s. Similarly the `ignoreSwap` member of this struct
+  must now be 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 c2a56b956d22274129e2e093b24821f8c1fe6b97..1a4bd09fb1651b5b829019d4c309509ba0bb1c50 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -79,7 +79,7 @@ extern "C" {
     typedef struct {
        bool(*swapEnds) (edge_t * e);   /* Should head and tail be swapped? */
        bool(*splineMerge) (node_t * n);        /* Is n a node in the middle of an edge? */
-       boolean ignoreSwap;                     /* Test for swapped edges if false */
+       bool ignoreSwap;                     /* Test for swapped edges if false */
        boolean isOrtho;                        /* Orthogonal routing used */
     } splineInfo;
 

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index 3435e5b6cdcb35b6c6b8a920a5129ac7873e94ef..e6ee3259643e7f6eea433c647b06acceb935e47a 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -1234,7 +1234,7 @@ static bool swap_ends_p(edge_t * e)
     return false;
 }
 
-static splineInfo sinfo = { swap_ends_p, spline_merge, 1, 1 };
+static splineInfo sinfo = { swap_ends_p, spline_merge, true, 1 };
 
 /* orthoEdges:
  * For edges without position information, construct an orthogonal routing.