now I don't understand what I'm doing -- cgraph

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index d51d4f8a10fb5f5ccf6d14d3b5fd360c506062b3..0b0c04560e4bec2a6093967faf6e5086fe1640fb 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -40,11 +40,11 @@ GVC_t *gvContext(void)
 {
     GVC_t *gvc;
 
-    aginit();
 #ifndef WITH_CGRAPH
+    aginit();
     agnodeattr(NULL, "label", NODENAME_ESC);
 #else
-    agattr(NULL, AGNODE, "label", NODENAME_ESC, 1);
+    agattr(NULL, AGNODE, "label", NODENAME_ESC);
 #endif
     gvc = gvNEWcontext(LibInfo, gvUsername());
     gvconfig(gvc, FALSE); /* configure for available plugins and codegens */

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index f91d1759e5dc5374fb5994a50380ae8849e5ff5f..718cdc6fed39b1d180ef2e06abeed333a66fc395 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -457,6 +457,7 @@ void gvplugin_write_status(GVC_t * gvc)
 
 Agraph_t * gvplugin_graph(GVC_t * gvc)
 {
+#ifndef WITH_CGRAPH
     Agraph_t *g, *sg, *ssg;
     Agnode_t *n, *m;
     Agedge_t *e;
@@ -610,4 +611,7 @@ Agraph_t * gvplugin_graph(GVC_t * gvc)
     }
 
     return g;
+#else
+    return NULL;
+#endif
 }