Purify globals.h to allow its inclusion with only cgraph.h;

removed second declaration of Verbose in general.h as second declarations confuse VS.

diff --git a/lib/common/args.c b/lib/common/args.c
index 4778a056fe60348a62205c7c11520e6a3652162d..902656f9cbc368b067e61866a505a718d41fab2e 100644 (file)
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -24,6 +24,7 @@
 #include "render.h"
 #include "tlayout.h"
 #include "gvc.h"
+#include "fdp.h"
 
 /* neato_extra_args:
  * Handle special neato arguments.
@@ -204,26 +205,26 @@ setFDPAttr (char* arg)
 {
   switch (*arg++) {
   case 'g' :
-    fdp_parms.useGrid = 0;
+    fdp_parms->useGrid = 0;
     break;
   case 'O' :
-    fdp_parms.useNew = 0;
+    fdp_parms->useNew = 0;
     break;
   case 'n' :
-    if (setInt (&fdp_parms.numIters, arg)) return 1;
+    if (setInt (&fdp_parms->numIters, arg)) return 1;
     break;
   case 'U' :
-    if (setInt (&fdp_parms.unscaled, arg)) return 1;
+    if (setInt (&fdp_parms->unscaled, arg)) return 1;
     break;
   case 'C' :
-    if (setDouble (&fdp_parms.C, arg)) return 1;
+    if (setDouble (&fdp_parms->C, arg)) return 1;
     break;
   case 'T' :
     if (*arg == '*') {
-      if (setDouble (&fdp_parms.Tfact, arg+1)) return 1;
+      if (setDouble (&fdp_parms->Tfact, arg+1)) return 1;
     }
     else {
-      if (setDouble (&fdp_parms.T0, arg)) return 1;
+      if (setDouble (&fdp_parms->T0, arg)) return 1;
     }
     break;
   default :

diff --git a/lib/common/globals.c b/lib/common/globals.c
index 65640dfef61384e1a0e1268edda3492e09fe3052..f359bc585c11f8d0fa6d7d0ecd74152bc50636ea 100644 (file)
--- a/lib/common/globals.c
+++ b/lib/common/globals.c
@@ -18,9 +18,10 @@
 #define EXTERN
 #include "types.h"
 #include "globals.h"
+#include "fdp.h"
 
 /* Default layout values, possibly set via command line; -1 indicates unset */
-fdpParms_t fdp_parms = {
+static fdpParms_t fdpParms = {
     1,                          /* useGrid */
     1,                          /* useNew */
     -1,                         /* numIters */
@@ -31,3 +32,4 @@ fdpParms_t fdp_parms = {
     -1.0,                       /* T0 */
 };
 
+struct fdpParms_s* fdp_parms = &fdpParms;

diff --git a/lib/common/globals.h b/lib/common/globals.h
index cd6c7b89e3fed138455b3b163c04e43c959cf5aa..dbbd2bec01a18b692db5054773f5ff22f9ea7ec8 100644 (file)
--- a/lib/common/globals.h
+++ b/lib/common/globals.h
@@ -71,7 +71,7 @@ extern "C" {
     EXTERN char *Gvimagepath; /* Per-graph path of files allowed in image attributes  (also ps libs) */
 
     EXTERN unsigned char Verbose;
-    EXTERN boolean Reduce;
+    EXTERN unsigned char Reduce;
     EXTERN int MemTest;
     EXTERN char *HTTPServerEnVar;
     EXTERN char *Output_file_name;
@@ -82,7 +82,7 @@ extern "C" {
     EXTERN int Show_cnt;
     EXTERN char** Show_boxes;  /* emit code for correct box coordinates */
     EXTERN int CL_type;                /* NONE, LOCAL, GLOBAL */
-    EXTERN boolean Concentrate;        /* if parallel edges should be merged */
+    EXTERN unsigned char Concentrate;  /* if parallel edges should be merged */
     EXTERN double Epsilon;     /* defined in input_graph */
     EXTERN int MaxIter;
     EXTERN int Ndim;
@@ -93,14 +93,14 @@ extern "C" {
     EXTERN int Y_invert;       /* invert y in dot & plain output */
     EXTERN int GvExitOnUsage;   /* gvParseArgs() should exit on usage or error */
 
-    EXTERN attrsym_t
+    EXTERN Agsym_t
        *G_activepencolor, *G_activefillcolor,
        *G_selectedpencolor, *G_selectedfillcolor,
        *G_visitedpencolor, *G_visitedfillcolor,
        *G_deletedpencolor, *G_deletedfillcolor,
        *G_ordering, *G_peripheries, *G_penwidth,
        *G_gradientangle, *G_margin;
-    EXTERN attrsym_t
+    EXTERN Agsym_t
        *N_height, *N_width, *N_shape, *N_color, *N_fillcolor,
        *N_activepencolor, *N_activefillcolor,
        *N_selectedpencolor, *N_selectedfillcolor,
@@ -112,7 +112,7 @@ extern "C" {
        *N_skew, *N_distortion, *N_fixed, *N_imagescale, *N_layer,
        *N_group, *N_comment, *N_vertices, *N_z,
        *N_penwidth, *N_gradientangle;
-    EXTERN attrsym_t
+    EXTERN Agsym_t
        *E_weight, *E_minlen, *E_color, *E_fillcolor,
        *E_activepencolor, *E_activefillcolor,
        *E_selectedpencolor, *E_selectedfillcolor,
@@ -130,7 +130,7 @@ extern "C" {
        *E_tailclip, *E_headclip,
        *E_penwidth;
 
-    extern fdpParms_t fdp_parms;
+    extern struct fdpParms_s* fdp_parms;
 
 #undef external
 #undef EXTERN

diff --git a/lib/common/types.h.in b/lib/common/types.h.in
index 38b012501c733824af59bf51974b56f95cb7e942..9297149c6beb16a57b12e749cb3e4ba7bb8cd8e2 100644 (file)
--- a/lib/common/types.h.in
+++ b/lib/common/types.h.in
@@ -751,18 +751,6 @@ typedef enum {NATIVEFONTS,PSFONTS,SVGFONTS} fontname_kind;
 #define agcanonStr(s) agcanonical(s)
 #endif
 
-
-    typedef struct {
-        int useGrid;            /* use grid for speed up */
-        int useNew;             /* encode x-K into attractive force */
-        int numIters;           /* actual iterations in layout */
-        int unscaled;           /* % of iterations used in pass 1 */
-        double C;               /* Repulsion factor in xLayout */
-        double Tfact;           /* scale temp from default expression */
-        double K;               /* spring constant; ideal distance */
-        double T0;              /* initial temperature */
-    } fdpParms_t;
-
     typedef struct {
        int flags;
     } gvlayout_features_t;

diff --git a/lib/fdpgen/fdp.h b/lib/fdpgen/fdp.h
index 8afceed850665db08d4f6742b74feb4faca20b7a..c68ceb5eb3ad5df7c20819007c9e9fc187e1dabb 100644 (file)
--- a/lib/fdpgen/fdp.h
+++ b/lib/fdpgen/fdp.h
@@ -115,6 +115,18 @@ typedef struct {
 extern "C" {
 #endif
 
+struct fdpParms_s {
+        int useGrid;            /* use grid for speed up */
+        int useNew;             /* encode x-K into attractive force */
+        int numIters;           /* actual iterations in layout */
+        int unscaled;           /* % of iterations used in pass 1 */
+        double C;               /* Repulsion factor in xLayout */
+        double Tfact;           /* scale temp from default expression */
+        double K;               /* spring constant; ideal distance */
+        double T0;              /* initial temperature */
+};
+typedef struct fdpParms_s fdpParms_t;
+
     extern void fdp_layout(Agraph_t * g);
     extern void fdp_nodesize(node_t *, boolean);
     extern void fdp_init_graph(Agraph_t * g);

diff --git a/lib/fdpgen/fdpinit.c b/lib/fdpgen/fdpinit.c
index 2d7fe3f966e42de58574c27b9066e0308bf01f23..5ae2c226f90930308ab471fcb9f04352429def9e 100644 (file)
--- a/lib/fdpgen/fdpinit.c
+++ b/lib/fdpgen/fdpinit.c
@@ -86,7 +86,7 @@ static void init_edge(edge_t * e, attrsym_t * E_len)
     agbindrec(e, "Agedgeinfo_t", sizeof(Agedgeinfo_t), TRUE);  //node custom data
 #endif /* WITH_CGRAPH */
     ED_factor(e) = late_double(e, E_weight, 1.0, 0.0);
-    ED_dist(e) = late_double(e, E_len, fdp_parms.K, 0.0);
+    ED_dist(e) = late_double(e, E_len, fdp_parms->K, 0.0);
 
     common_init_edge(e);
 }

diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c
index 120e9e0341b5eb6b5edd2bf47208c5e0994bd156..c3da60f0692c2322268265902950de0b2f168780 100644 (file)
--- a/lib/fdpgen/tlayout.c
+++ b/lib/fdpgen/tlayout.c
@@ -57,14 +57,14 @@ extern double drand48(void);
 #include "tlayout.h"
 #include "globals.h"
 
-#define D_useGrid   (fdp_parms.useGrid)
-#define D_useNew    (fdp_parms.useNew)
-#define D_numIters  (fdp_parms.numIters)
-#define D_unscaled  (fdp_parms.unscaled)
-#define D_C         (fdp_parms.C)
-#define D_Tfact     (fdp_parms.Tfact)
-#define D_K         (fdp_parms.K)
-#define D_T0        (fdp_parms.T0)
+#define D_useGrid   (fdp_parms->useGrid)
+#define D_useNew    (fdp_parms->useNew)
+#define D_numIters  (fdp_parms->numIters)
+#define D_unscaled  (fdp_parms->unscaled)
+#define D_C         (fdp_parms->C)
+#define D_Tfact     (fdp_parms->Tfact)
+#define D_K         (fdp_parms->K)
+#define D_T0        (fdp_parms->T0)
 
   /* Actual parameters used; initialized using fdp_parms, then possibly
    * updated with graph-specific values.

diff --git a/lib/sparse/general.h b/lib/sparse/general.h
index 054f58fef4938c0b21b7c51a7b1f25ad1d6c6843..9411d86fd891d5b83220983114a221b49e099e3c 100644 (file)
--- a/lib/sparse/general.h
+++ b/lib/sparse/general.h
@@ -24,6 +24,8 @@
  * In particular, note that Verbose is declared but undefined.
  */
 #ifndef STANDALONE
+#include <cgraph.h>
+#include <globals.h>
 #include <logic.h>
 #include <arith.h>
 #include <memory.h>
@@ -61,6 +63,7 @@
 #define POINTS(inch) 72*(inch)
 
 typedef unsigned int boolean;
+extern unsigned char Verbose;
 
 #else  /* STANDALONE */
 #define MALLOC gmalloc
@@ -78,7 +81,6 @@ typedef unsigned int boolean;
 extern double _statistics[10];
 #endif
 
-extern unsigned char Verbose;
 
 extern int irand(int n);
 extern real drand(void);