fix -Txdot (by making "agxbuf charbuf;" and "agxbuf outbuf;" global - yuch!)

diff --git a/lib/common/input.c b/lib/common/input.c
index f5e12441a831ef054d848f24fc0706df7102f3de..f1158599fb9fd4289f11c9c78dd5984ef8b1487b 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -739,12 +739,12 @@ static codegen_info_t cg[MAX_CODEGENS] = {
     {&SVG_CodeGen, "svgz", SVGZ},
     {&DIA_CodeGen, "dia", DIA},
 #endif
-#define DUMMY_Codegen XDot_CodeGen
-    {&DUMMY_Codegen, "dot", ATTRIBUTED_DOT},
-    {&DUMMY_Codegen, "canon", CANONICAL_DOT},
-    {&DUMMY_Codegen, "plain", PLAIN},
-    {&DUMMY_Codegen, "plain-ext", PLAIN_EXT},
-    {&XDot_CodeGen, "xdot", EXTENDED_DOT},
+#define DUMMY_CodeGen XDot_CodeGen
+    {&DUMMY_CodeGen, "dot", ATTRIBUTED_DOT},
+    {&DUMMY_CodeGen, "canon", CANONICAL_DOT},
+    {&DUMMY_CodeGen, "plain", PLAIN},
+    {&DUMMY_CodeGen, "plain-ext", PLAIN_EXT},
+    {&DUMMY_CodeGen, "xdot", EXTENDED_DOT},
     {NULL, NULL, 0}
 };
 

diff --git a/lib/common/output.c b/lib/common/output.c
index 409c5bb36fb431cbdb1d7d776c1025f4d1ef7d09..1896b00a309b615500f2b13d88df8733c29ab097 100644 (file)
--- a/lib/common/output.c
+++ b/lib/common/output.c
@@ -20,8 +20,8 @@
 
 static int e_arrows;           /* graph has edges with end arrows */
 static int s_arrows;           /* graph has edges with start arrows */
-static agxbuf outbuf;
-static agxbuf charbuf;
+agxbuf outbuf;
+agxbuf charbuf;
 
 static void printptf(FILE * f, point pt)
 {

diff --git a/lib/common/xdgen.c b/lib/common/xdgen.c
index 70cbc6e440bf6e5092008dd4f15bb5f2ba6ee4b0..88a7f3a143c1e372d27c5160de90ab41927d3225 100644 (file)
--- a/lib/common/xdgen.c
+++ b/lib/common/xdgen.c
@@ -18,8 +18,8 @@
 #include       "gvc.h"
 #include       "agxbuf.h"
 
-static agxbuf charbuf;
-static agxbuf outbuf;
+extern agxbuf charbuf;
+extern agxbuf outbuf;
 static Agraph_t *cluster_g;
 
 static void xd_textline(point p, textline_t * line)