use agfindnode/agfindedge macros

diff --git a/lib/dotgen/class2.c b/lib/dotgen/class2.c
index 0cb56590c4da6cc96641bb22ffbcf69fe523ae0b..b874c01ce3c721ec607ebc7298c0c5b35d58f9c0 100644 (file)
--- a/lib/dotgen/class2.c
+++ b/lib/dotgen/class2.c
@@ -281,11 +281,7 @@ void class2(graph_t * g)
            else {
                /*other_edge(e); */
                /* avoid when opp==e in undirected graph */
-#ifndef WITH_CGRAPH
                if ((opp = agfindedge(g, aghead(e), agtail(e))) && (opp != e)) {
-#else
-               if ((opp = agedge(g, aghead(e), agtail(e),(char*)0,0)) && (opp != e)) {
-#endif
                    /* shadows a forward edge */
                    if (ED_to_virt(opp) == NULL)
                        make_chain(g, agtail(opp), aghead(opp), opp);

diff --git a/lib/neatogen/constraint.c b/lib/neatogen/constraint.c
index f24ee919937c5620d6f6e6e28e875a8c975fc33c..049d9d3f5b6e5811620457c427aaaf4423c17864 100644 (file)
--- a/lib/neatogen/constraint.c
+++ b/lib/neatogen/constraint.c
@@ -273,11 +273,7 @@ static graph_t *mkNConstraintG(graph_t * g, Dt_t * list,
                ED_minlen(e) = delta;
                ED_weight(e) = 1;
            }
-#ifndef WITH_CGRAPH
            if (e && agfindedge(g,p->np, nxp->np)) {
-#else /* WITH_CGRAPH */
-           if (e && agedge(g, p->np, nxp->np, NULL, 0)) {
-#endif /* WITH_CGRAPH */
                ED_weight(e) = 100;
             }
 #if 0