From: ellson <devnull@localhost>
Date: Thu, 7 Aug 2008 17:17:46 +0000 (+0000)
Subject: Removing all existing usage of USE_CGRAPH
X-Git-Tag: LAST_LIBGRAPH~32^2~3658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a1170a6f58cff455664d055b55976e4864a1c42;p=graphviz

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/nop.c b/cmd/tools/nop.c
index 0995f9866..67f62f0ac 100644
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -18,19 +18,12 @@
 #include "config.h"
 #endif
 
-#ifdef USE_CGRAPH
-#include <cgraph.h>
-#else
-typedef char Agnodeinfo_t;
-typedef char Agedgeinfo_t;
-typedef char Agraphinfo_t;
-#include <graph.h>
-#endif
-#include <ingraphs.h>
+#include "cgraph.h"
+#include "ingraphs.h"
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
-#include	<unistd.h>
+#include <unistd.h>
 #endif
 
 #ifdef HAVE_GETOPT_H
@@ -80,11 +73,7 @@ static void init(int argc, char *argv[])
 
 static Agraph_t *gread(FILE * fp)
 {
-#ifdef USE_CGRAPH
     return agread(fp, (Agdisc_t *) 0);
-#else
-    return agread(fp);
-#endif
 }
 
 int main(int argc, char **argv)
@@ -93,9 +82,6 @@ int main(int argc, char **argv)
     ingraph_state ig;
 
     init(argc, argv);
-#ifndef USE_CGRAPH
-    aginit ();
-#endif
     newIngraph(&ig, Files, gread);
 
     while ((g = nextGraph(&ig)) != 0) {