more header rationalization

diff --git a/lib/common/types.h b/lib/common/types.h
index f9849aaf3a4f694f9f1c3d75aa8269ce8ab28314..4d2af6372dbad07942da55acbc44d2ef001a6d02 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -189,9 +189,6 @@ extern "C" {
     } shape_desc;
 
 #ifndef DISABLE_CODEGENS
-    typedef struct codegen_s codegen_t;
-    typedef struct codegen_info_s codegen_info_t;
-
     struct codegen_s {
        void (*reset) (void);
        void (*begin_job) (FILE * ofp, graph_t * g, char **lib, char *user,

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index ce17376605f9fb0cd6008868d2452c614ae86dae..77bc91c05c69634121c2a6c89fb1842d9ea4e52c 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -23,6 +23,11 @@
 extern "C" {
 #endif
 
+#ifndef DISABLE_CODEGENS
+    typedef struct codegen_s codegen_t;
+    typedef struct codegen_info_s codegen_info_t;
+#endif
+
     typedef struct GVJ_s GVJ_t;
     typedef struct GVC_s GVC_t;
 

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index c6f652a8968cc7b947b2d0baa7be189d9edb563d..cead70a8972692caadf59808928228e28428914b 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -25,8 +25,6 @@ extern "C" {
 
 #include "gvcjob.h"
 
-#define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
-
     typedef struct {
        int flags;
     } gvlayout_features_t;

diff --git a/lib/gvc/gvcjob.h b/lib/gvc/gvcjob.h
index 2656b905f4439597d6e616bc9667ae546ec5e843..663064cac8a267bac001ece509ec4ecd52d23d73 100644 (file)
--- a/lib/gvc/gvcjob.h
+++ b/lib/gvc/gvcjob.h
@@ -23,7 +23,9 @@
 extern "C" {
 #endif
 
-#include "types.h"
+#include "geom.h"
+#include "color.h"
+#include "gvcext.h"
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 

diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c
index b8142ff52dd430fd3ba3d8724aaccd0b09a6e0f2..ee62c97582a3e3550440a0c7a6a0261f25c8cc4e 100644 (file)
--- a/lib/gvc/gvevent.c
+++ b/lib/gvc/gvevent.c
@@ -14,11 +14,20 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
-#include "render.h"
-#include "gvcjob.h"
+#include "gvplugin.h"
+#include "types.h"
+#include "graph.h"
 #include "gvcint.h"
 #include "gvcproc.h"
 
+#include <string.h>
+extern char *strdup_and_subst_graph(char *str, Agraph_t * g);
+extern char *strdup_and_subst_edge(char *str, Agedge_t * e);
+extern char *strdup_and_subst_node(char *str, Agnode_t * n);
+extern void emit_graph(GVJ_t * job, graph_t * g);
+extern bool overlap_edge(edge_t *e, boxf b);
+extern bool overlap_node(node_t *n, boxf b);
+
 #define PANFACTOR 10
 #define ZOOMFACTOR 1.1
 #define EPSILON .0001

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index a4c0ca4ee60f2be2239a07e5325c7804c1a336e3..9676a0cdcb7a2c4a7a299dbec3022da32b254e75 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -18,14 +18,8 @@
 #include "config.h"
 #endif
 
-#include       <stdio.h>
-#include       <stdlib.h>
-
-#include       "geom.h"
 #include       "memory.h"
-
 #include       "types.h"
-
 #include        "gvplugin.h"
 #include        "gvcint.h"
 #include        "gvcproc.h"

diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c
index 3270f92072eae9277efd168a7660626d07996cab..b98b8a7bf2c92df7f2957283f6b1d458bb22a082 100644 (file)
--- a/lib/gvc/gvlayout.c
+++ b/lib/gvc/gvlayout.c
@@ -25,15 +25,11 @@
 
 #include <stdio.h>
 
-#include "geom.h"
-
 #include "const.h"
 #include "types.h"
 #include "graph.h"
-#include "cdt.h"
 
 #include "gvplugin_layout.h"
-#include "gvcint.h"
 #include "gvcproc.h"
 
 extern void graph_init(graph_t *g, bool use_rankdir);

diff --git a/lib/gvc/gvplugin.h b/lib/gvc/gvplugin.h
index a7bf48af7deb48af24a996b5d634bee542187d08..22be6dcb2cfb269a2b58455eae6f7f33e42d4b20 100644 (file)
--- a/lib/gvc/gvplugin.h
+++ b/lib/gvc/gvplugin.h
@@ -19,12 +19,12 @@
 #ifndef GVPLUGIN_H
 #define GVPLUGIN_H
 
-#include "gvcext.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "gvcext.h"
+
 #ifndef NULL
 #define NULL (void *)0
 #endif

diff --git a/lib/gvc/gvplugin_layout.h b/lib/gvc/gvplugin_layout.h
index 626bf2112401aad0b9eea647bcc4e0130e5142a9..e47cbfd7842169700ea934454a68da2decb6b032 100644 (file)
--- a/lib/gvc/gvplugin_layout.h
+++ b/lib/gvc/gvplugin_layout.h
@@ -18,8 +18,6 @@
 #define GVLAYOUT_PLUGIN_H
 
 #include "gvplugin.h"
-#include "geom.h"
-#include "color.h"
 #include "gvcint.h"
 
 #ifdef __cplusplus

diff --git a/lib/gvc/gvplugin_textlayout.h b/lib/gvc/gvplugin_textlayout.h
index b96e366fee75276ffbee5d4cfea6d62584eebbbc..314c9782a2edd0fbbd16dad934008a9785843ab7 100644 (file)
--- a/lib/gvc/gvplugin_textlayout.h
+++ b/lib/gvc/gvplugin_textlayout.h
@@ -18,8 +18,6 @@
 #define GVTEXTLAYOUT_PLUGIN_H
 
 #include "gvplugin.h"
-#include "geom.h"
-#include "color.h"
 #include "gvcint.h"
 
 #ifdef __cplusplus

diff --git a/lib/gvc/gvplugin_usershape.h b/lib/gvc/gvplugin_usershape.h
index defaf99861e6770a4d795c2d33e628e99fe9aed1..c0707c9212464823d1048c9c06a89ff76bdd4582 100644 (file)
--- a/lib/gvc/gvplugin_usershape.h
+++ b/lib/gvc/gvplugin_usershape.h
@@ -18,8 +18,6 @@
 #define GVUSERSHAPE_PLUGIN_H
 
 #include "gvplugin.h"
-#include "geom.h"
-#include "color.h"
 #include "gvcint.h"
 
 #ifdef __cplusplus

diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c
index df56824846e08f42f3878c9297ceb5ceb910038a..9a0aaea9b758e66a12afec285c0134a2f8b6cfeb 100644 (file)
--- a/lib/gvc/gvtextlayout.c
+++ b/lib/gvc/gvtextlayout.c
@@ -24,13 +24,10 @@
 
 #include <stdio.h>
 
-#include "geom.h"
-
 #include "const.h"
 #include "types.h"
 
 #include "gvplugin_textlayout.h"
-#include "gvcint.h"
 #include "gvcproc.h"
 
 int gvtextlayout_select(GVC_t * gvc, char *textlayout)

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 2ac2a0e8df15d9f099a094eff37b424f670d0deb..494960cc6bcc4c51685cce38fa82d20cfe32c796 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -37,15 +37,12 @@
 
 #include <stdio.h>
 
-#include "geom.h"
-
 #include "macros.h"
 #include "const.h"
 #include "types.h"
 #include "graph.h"
 
 #include "gvplugin_usershape.h"
-#include "gvcint.h"
 #include "gvcproc.h"
 
 extern point gd_image_size(graph_t * g, char *shapeimagefile);