cgraph fixes

diff --git a/lib/neatogen/neatoprocs.h b/lib/neatogen/neatoprocs.h
index e60a8c311aeb22028c3e0bc7f7f93ae5659987e3..1f831cee9eda17d6145c4669aaa2c983eb102c2f 100644 (file)
--- a/lib/neatogen/neatoprocs.h
+++ b/lib/neatogen/neatoprocs.h
@@ -33,7 +33,6 @@ extern "C" {
     extern double distvec(double *, double *, double *);
     extern void do_graph_label(Agraph_t *);
     extern void final_energy(graph_t *, int);
-    extern double doubleattr(void *, int, double);
     extern double fpow32(double);
     extern Ppolyline_t getPath(edge_t *, vconfig_t *, int, Ppoly_t **,
                               int);

diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c
index 40e37570ce14a6444db03b8949091b2cbe9018da..0dc8d81fd6152e35a5c2f0b80f1016623e37e412 100644 (file)
--- a/lib/neatogen/stuff.c
+++ b/lib/neatogen/stuff.c
@@ -115,7 +115,7 @@ static void free_3array(double ***rv)
     }
 }
 
-double doubleattr(void *obj, int index, double defval)
+static double doubleattr(void *obj, int index, double defval)
 {
     double val;
     if (index < 0)
@@ -197,9 +197,7 @@ static double setEdgeLen(graph_t * G, node_t * np, int lenx)
     double len=0;
 
     for (ep = agfstout(G, np); ep; ep = agnxtout(G, ep)) {
-#ifndef WITH_CGRAPH
        len = doubleattr(ep, lenx, 1.0);
-#endif /* WITH_CGRAPH */
        if (len <= 0) {
            agerr(AGERR, "bad edge len %f in %s ignored\n", len, agnameof(G));
            len = 1.0;