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.

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 00731dc32c25f9877ff1e19d101f5ffcf3c5cbac..a6f2943ba8f64fd6409c92f3a8331f6482b7f6d2 100644 (file)
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -30,12 +30,11 @@
 #endif
 
 #include <assert.h>
-#include <gvc.h>
-#include <render.h>
-#include <neatoprocs.h>
-#include <ingraphs.h>
-#include <pack.h>
-#include <assert.h>
+#include "gvc.h"
+#include "render.h"
+#include "neatoprocs.h"
+#include "ingraphs.h"
+#include "pack.h"
 
 #include "builddate.h"
 

diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index aa7965c2d69475a09ad5d0d297af490f6ca66377..2f2f5dbea368be3f199b687da98144d5a52c729e 100644 (file)
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -15,10 +15,7 @@
 **********************************************************/
 
 
-#include    <convert.h>
-#ifndef USE_CGRAPH
-#include    "aghdr.h"
-#endif
+#include    "convert.h"
 #include    "agxbuf.h"
 #ifdef HAVE_EXPAT
 #include    <expat.h>
@@ -245,11 +242,7 @@ static Agedge_t *bind_edge(const char *tail, const char *head)
 
     tailNode = agnode(G, (char *) tail, 1);
     headNode = agnode(G, (char *) head, 1);
-#ifdef USE_CGRAPH
     E = agedge(G, tailNode, headNode, key, 1);
-#else
-    E = agedge(tailNode, headNode, key, 1);
-#endif
     return E;
 }
 

diff --git a/cmd/tools/mmio.c b/cmd/tools/mmio.c
index c29a7e456ddeace46cf92c86438283f40c5f918b..9a45bd01fd6741b0c0da78e8e40131b519b4db71 100644 (file)
--- a/cmd/tools/mmio.c
+++ b/cmd/tools/mmio.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-/*#include <malloc.h>*/
 #include <ctype.h>
 
 #include "mmio.h"