From 587d861cf4c81c1dfd9c1df84798a42a5ca7d8d8 Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Wed, 22 Jul 2009 15:07:34 +0000
Subject: [PATCH] fix smyrna enough so that it compiles, reduce some compiler
 warning noise

---
 cmd/smyrna/smyrnadefs.h |  2 +-
 cmd/smyrna/topview.c    |  2 +-
 cmd/tools/gmlparse.y    | 16 ++++++++--------
 lib/xdot/xdot.c         |  2 +-
 lib/xdot/xdot.h         |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index a62dea2b5..52ae96e47 100644
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -20,7 +20,6 @@
 #ifndef NO_WIN_HEADER
 #include "windows.h"
 #endif
-#include "xdot.h"
 //#define       SMYRNA_GLADE "C:/Projects/graphviz2/share/gui/smyrna.glade"
 #define	SMYRNA_ATTRS "c:/graphviz-ms/graphviz2/share/gui/attrs.txt"
 #endif
@@ -30,6 +29,7 @@
 #define _BB
 #endif
 
+#include "xdot.h"
 #include <gtk/gtk.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
diff --git a/cmd/smyrna/topview.c b/cmd/smyrna/topview.c
index f62c21ad5..6367c0ae4 100755
--- a/cmd/smyrna/topview.c
+++ b/cmd/smyrna/topview.c
@@ -58,7 +58,7 @@ static int select_topview_node(topview_node * n);
 static int update_topview_node_from_cgraph(topview_node * Node);
 #endif
 static int get_color_from_edge(topview_edge * e);
-static int pick_node(topview_node * n);
+//static int pick_node(topview_node * n);
 
 #ifdef UNUSED
 static void remove_recs()
diff --git a/cmd/tools/gmlparse.y b/cmd/tools/gmlparse.y
index 5b4f330b1..828009dc9 100644
--- a/cmd/tools/gmlparse.y
+++ b/cmd/tools/gmlparse.y
@@ -117,7 +117,7 @@ static Dtdisc_t graphDisc = {
 };
 
 static void
-initstk ()
+initstk (void)
 {
     liststk_sz = 10;
     liststk_cnt = 0;
@@ -125,7 +125,7 @@ initstk ()
 }
 
 static void
-cleanup ()
+cleanup (void)
 {
     int i;
 
@@ -154,7 +154,7 @@ cleanup ()
 }
 
 static void
-pushAlist ()
+pushAlist (void)
 {
     Dt_t* lp = dtopen (&attrDisc, Dtqueue);
 
@@ -169,7 +169,7 @@ pushAlist ()
 }
 
 static Dt_t*
-popAlist ()
+popAlist (void)
 {
     Dt_t* lp = L;
 
@@ -182,13 +182,13 @@ popAlist ()
 }
 
 static void
-popG ()
+popG (void)
 {
     G = G->parent;
 }
 
 static void
-pushG ()
+pushG (void)
 {
     gmlgraph* g = NEW(gmlgraph);
 
@@ -206,7 +206,7 @@ pushG ()
 }
 
 static gmlnode*
-mkNode ()
+mkNode (void)
 {
     gmlnode* np = NEW(gmlnode);
     np->attrlist = dtopen (&attrDisc, Dtqueue);
@@ -215,7 +215,7 @@ mkNode ()
 }
 
 static gmledge*
-mkEdge ()
+mkEdge (void)
 {
     gmledge* ep = NEW(gmledge);
     ep->attrlist = dtopen (&attrDisc, Dtqueue);
diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index 53fbe0f43..3b0e315e3 100755
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -671,7 +671,7 @@ void free_xdotset(xdot_set* s)
 	free (s);
 }
 
-xdot_set* init_xdot_set()
+xdot_set* init_xdot_set(void)
 {
 	xdot_set* rv;
 	rv=malloc(sizeof(xdot_set));
diff --git a/lib/xdot/xdot.h b/lib/xdot/xdot.h
index c34408f50..47ac6ffda 100755
--- a/lib/xdot/xdot.h
+++ b/lib/xdot/xdot.h
@@ -112,7 +112,7 @@ extern char* sprintXDot (xdot*);
 extern void fprintXDot (FILE*, xdot*);
 extern void freeXDot (xdot*);
 extern void free_xdotset(xdot_set* s);
-extern xdot_set* init_xdot_set();
+extern xdot_set* init_xdot_set(void);
 extern void add_to_xdot_set(xdot_set* s,xdot *x);
 extern void print_xdot_set(xdot_set* s);
 
-- 
2.40.0