From d7fde479c169d5639d3889f1a13af8ee4d349964 Mon Sep 17 00:00:00 2001 From: ellson Date: Thu, 7 Aug 2008 17:17:46 +0000 Subject: [PATCH] Removing all existing usage of USE_CGRAPH cgraph is now in full production in all these files configure.ac still contains the --with-cgraph option in case Arif wants to use it. --- cmd/tools/dijkstra.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c index fc4e1b740..65fd0ff0f 100644 --- a/cmd/tools/dijkstra.c +++ b/cmd/tools/dijkstra.c @@ -21,12 +21,8 @@ #include #include #include -#ifdef USE_CGRAPH -#include -#else -#include -#endif -#include +#include "cgraph.h" +#include "ingraphs.h" #ifdef HAVE_GETOPT_H #include #else @@ -169,11 +165,7 @@ static void post(Agraph_t * g) if (setall) sprintf(dflt, "%.3lf", HUGE); -#ifdef USE_CGRAPH for (v = agfstnode(g); v; v = agnxtnode(g, v)) { -#else - for (v = agfstnode(g); v; v = agnxtnode(v)) { -#endif dist = getdist(v); if (dist) { dist--; @@ -217,11 +209,7 @@ void dijkstra(Dict_t * Q, Agraph_t * G, Agnode_t * n) setdist(n, 1); dtinsert(Q, n); while ((u = extract_min(Q))) { -#ifdef USE_CGRAPH for (e = agfstedge(G, u); e; e = agnxtedge(G, e, u)) { -#else - for (e = agfstedge(u); e; e = agnxtedge(e, u)) { -#endif update(Q, e->node, u, getlength(e)); } } -- 2.40.0