From: Erwin Janssen Date: Sun, 18 Sep 2016 01:15:34 +0000 (+0200) Subject: Remove all references to getopt_compat.h X-Git-Tag: untagged-4431b9bde391f1b69fe5^2~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d0738d2f6161669fa308b0fe92732eca93d2561;p=graphviz Remove all references to getopt_compat.h This file is removed, so references to this file should be removed as well. --- diff --git a/Makefile.am b/Makefile.am index 442b6d128..3784dcf45 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ $(top_builddir)/graphviz_version.h: config.h EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ autogen.sh config/depcomp config/config.rpath \ builddate.h ast_common.h.in compat.h \ - Makeargs compat_getopt.h iffe config.iffe \ + Makeargs iffe config.iffe \ m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \ graphviz.7 Doxyfile.in Doxyfile features awk \ config/config_perl.pl config/config_python.py \ diff --git a/cmd/edgepaint/edgepaintmain.c b/cmd/edgepaint/edgepaintmain.c index abfdbdbf3..23ee6e70f 100644 --- a/cmd/edgepaint/edgepaintmain.c +++ b/cmd/edgepaint/edgepaintmain.c @@ -26,11 +26,7 @@ #include #include #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "general.h" #include "SparseMatrix.h" diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp index 05c83583e..2510c7697 100644 --- a/cmd/gvedit/main.cpp +++ b/cmd/gvedit/main.cpp @@ -22,11 +22,7 @@ /* #include */ #include "mainwindow.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "gvc.h" #include "globals.h" diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c index 6c91dfb78..bd74b66cc 100644 --- a/cmd/gvmap/cluster.c +++ b/cmd/gvmap/cluster.c @@ -20,11 +20,7 @@ #include "QuadTree.h" #include #include "SparseMatrix.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "string.h" #include "make_map.h" #include "spring_electrical.h" diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c index 65c30ad0a..cabcb5a0c 100644 --- a/cmd/gvmap/gvmap.c +++ b/cmd/gvmap/gvmap.c @@ -20,11 +20,7 @@ #include "QuadTree.h" #include #include "SparseMatrix.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "string.h" #include "make_map.h" #include "spring_electrical.h" diff --git a/cmd/mingle/minglemain.c b/cmd/mingle/minglemain.c index f312a6ade..d8cfb080f 100644 --- a/cmd/mingle/minglemain.c +++ b/cmd/mingle/minglemain.c @@ -26,11 +26,7 @@ #include #include #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "DotIO.h" #include "edge_bundling.h" diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c index a082c3fdd..a3e6f6aa4 100755 --- a/cmd/smyrna/main.c +++ b/cmd/smyrna/main.c @@ -38,11 +38,7 @@ #include "glexpose.h" #include "glutrender.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #ifdef G_OS_WIN32 gchar *package_prefix; diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c index c734a4ef0..ce9732473 100644 --- a/cmd/tools/acyclic.c +++ b/cmd/tools/acyclic.c @@ -46,11 +46,7 @@ typedef struct { #define ND_onstack(n) (((Agnodeinfo_t*)((n)->base.data))->onstack) #define graphName(g) (agnameof(g)) -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif static FILE *inFile; static FILE *outFile; diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c index 4263d999a..e5cf19c6e 100644 --- a/cmd/tools/bcomps.c +++ b/cmd/tools/bcomps.c @@ -22,11 +22,7 @@ #include #include #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include #include "cgraph.h" diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c index 6f3dde0a9..8aa79c5a0 100644 --- a/cmd/tools/ccomps.c +++ b/cmd/tools/ccomps.c @@ -44,11 +44,7 @@ typedef struct { #define ND_clust(n) ((Agraph_t*)ND_ptr(n)) #define agfindnode(G,N) (agnode(G, N, 0)) -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #ifdef HAVE_UNISTD_H #include diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c index 79c030a32..07c6fc5b0 100644 --- a/cmd/tools/cvtgxl.c +++ b/cmd/tools/cvtgxl.c @@ -19,11 +19,7 @@ #include "config.h" #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "convert.h" #include "ingraphs.h" diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c index 429f4a170..5708e1c35 100644 --- a/cmd/tools/dijkstra.c +++ b/cmd/tools/dijkstra.c @@ -25,11 +25,7 @@ #include #include "cgraph.h" #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #ifndef HUGE /* HUGE is not defined on 64bit HP-UX */ diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c index 965ba71bc..eb5234d24 100644 --- a/cmd/tools/gc.c +++ b/cmd/tools/gc.c @@ -43,11 +43,7 @@ typedef struct { #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #define NODES 1 #define EDGES 2 diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c index 2c573d2b9..f96fbecc4 100644 --- a/cmd/tools/gml2gv.c +++ b/cmd/tools/gml2gv.c @@ -20,11 +20,7 @@ #include #endif -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #define N_NEW(n,t) (t*)malloc((n)*sizeof(t)) diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c index f6ffd9906..346c01b90 100644 --- a/cmd/tools/gv2gml.c +++ b/cmd/tools/gv2gml.c @@ -30,11 +30,7 @@ #include #endif -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include #include diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c index c4daf1476..e0a99084f 100644 --- a/cmd/tools/gvcolor.c +++ b/cmd/tools/gvcolor.c @@ -45,11 +45,7 @@ typedef struct Agnodeinfo_t { #include #endif -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif double Defcolor[NC] = { 0.0, 0.0, 1.0 }; /* white */ int Forward = 1; /* how to propagate colors w.r.t. ranks */ diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c index d88aa413f..0a766bb6a 100644 --- a/cmd/tools/gvgen.c +++ b/cmd/tools/gvgen.c @@ -29,11 +29,7 @@ #endif #include #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "graph_generator.h" typedef enum { unknown, grid, circle, complete, completeb, diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index 909559e6a..cda9c0bac 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -20,11 +20,7 @@ #include "config.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include #include "gvc.h" diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c index 1d6577bcf..2ebc5ad75 100644 --- a/cmd/tools/mm2gv.c +++ b/cmd/tools/mm2gv.c @@ -25,11 +25,7 @@ #include "agxbuf.h" #include "SparseMatrix.h" #include "matrix_market.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #define MALLOC malloc #define FREE free diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c index ba1913ae4..bc3f37dd5 100644 --- a/cmd/tools/nop.c +++ b/cmd/tools/nop.c @@ -21,11 +21,7 @@ #include #endif -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif char **Files; int chkOnly; diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c index d62f19288..68d1fa440 100644 --- a/cmd/tools/sccmap.c +++ b/cmd/tools/sccmap.c @@ -32,11 +32,7 @@ #include "cgraph.h" #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #define INF ((unsigned int)(-1)) diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c index 399804fef..ea15ecb8c 100644 --- a/cmd/tools/tred.c +++ b/cmd/tools/tred.c @@ -39,11 +39,7 @@ typedef struct { #endif #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif char **Files; char *CmdName; diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c index 45b434c50..52f1f91da 100644 --- a/cmd/tools/unflatten.c +++ b/cmd/tools/unflatten.c @@ -27,11 +27,7 @@ #include "cgraph.h" #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif static int Do_fans = 0; static int MaxMinlen = 0; diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c index f99c0e72c..56fb457ac 100644 --- a/contrib/prune/prune.c +++ b/contrib/prune/prune.c @@ -21,11 +21,7 @@ #include #include -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #include "cgraph.h" #include "ingraphs.h" diff --git a/doc/libgraph/sccmap.c b/doc/libgraph/sccmap.c index 6d6d85251..6808462b6 100644 --- a/doc/libgraph/sccmap.c +++ b/doc/libgraph/sccmap.c @@ -19,11 +19,7 @@ #include "cgraph.h" #include "ingraphs.h" -#ifdef HAVE_GETOPT_H #include -#else -#include "compat_getopt.h" -#endif #define INF ((unsigned int)(-1))