rename "queue" to "nodequeue" to avoid conflict with definition in:

/usr/include/sys/stream.h (just on Suns?)

diff --git a/lib/common/ns.c b/lib/common/ns.c
index 5962865086317e1642b1163ca550e458907aa18d..aba858825be1cb16fe05a3dc59687a309094b68e 100644 (file)
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -101,7 +101,7 @@ static
 void init_rank(void)
 {
     int i, ctr;
-    queue *Q;
+    nodequeue *Q;
     node_t *v;
     edge_t *e;
 

diff --git a/lib/common/renderprocs.h b/lib/common/renderprocs.h
index 159eaecbf5565c71af11cd44afa2367d7d8c5f94..54068ed09ca2977003359d02518e3df3552682c2 100644 (file)
--- a/lib/common/renderprocs.h
+++ b/lib/common/renderprocs.h
@@ -56,7 +56,7 @@ extern "C" {
     extern point coord(node_t * n);
     extern pointf cvt2ptf(point);
     extern point cvt2pt(pointf);
-    extern Agnode_t *dequeue(queue *);
+    extern Agnode_t *dequeue(nodequeue *);
     extern void do_graph_label(graph_t * sg);
     extern point dotneato_closest(splines * spl, point p);
     extern void graph_init(graph_t * g);
@@ -68,8 +68,8 @@ extern "C" {
     extern void dotneato_write(GVC_t * gvc, graph_t *g);
     extern void dotneato_write_one(GVC_t * gvc, graph_t *g);
     extern double elapsed_sec(void);
-    extern void enqueue(queue *, Agnode_t *);
-    extern void enqueue_neighbors(queue *, Agnode_t *, int);
+    extern void enqueue(nodequeue *, Agnode_t *);
+    extern void enqueue_neighbors(nodequeue *, Agnode_t *, int);
     extern void emit_attachment(GVC_t * gvc, textlabel_t *, splines *);
     extern void emit_background(GVC_t * gvc, graph_t *g);
     extern void emit_clusters(GVC_t * gvc, Agraph_t * g, int flags);
@@ -92,7 +92,7 @@ extern "C" {
     extern pointf flip_ptf(pointf p, int rankdir);
     extern void free_line(textline_t *);
     extern void free_label(textlabel_t *);
-    extern void free_queue(queue *);
+    extern void free_queue(nodequeue *);
     extern void free_ugraph(graph_t *);
     extern char *gd_alternate_fontlist(char *font);
     extern char *gd_textsize(textline_t * textline, char *fontname,
@@ -138,7 +138,7 @@ extern "C" {
     extern boxf mkboxf(pointf, pointf);
     extern point neato_closest(splines * spl, point p);
     extern bezier *new_spline(edge_t * e, int sz);
-    extern queue *new_queue(int);
+    extern nodequeue *new_queue(int);
     extern Agraph_t *next_input_graph(void);
     extern void osize_label(textlabel_t *, int *, int *, int *, int *);
     extern char **parse_style(char *s);

diff --git a/lib/common/types.h b/lib/common/types.h
index e3082d10d683848fdcf599c14b37fc456f7d29f3..f2d56b397cbee1d7a88cd190db28e41073473911 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -253,9 +253,9 @@ extern "C" {
 
 #endif
 
-    typedef struct queue {
+    typedef struct nodequeue {
        node_t **store, **limit, **head, **tail;
-    } queue;
+    } nodequeue;
 
     typedef struct adjmatrix_t {
        int nrows, ncols;

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 12639d4ada74a704328719bb422256dd4a052a4f..b668261bb63a8fc7b52f8cafc893aecb77140eae 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -75,9 +75,9 @@ void *grealloc(void *ptr, size_t size)
 /*
  *  a queue of nodes
  */
-queue *new_queue(int sz)
+nodequeue *new_queue(int sz)
 {
-    queue *q = NEW(queue);
+    nodequeue *q = NEW(nodequeue);
 
     if (sz <= 1)
        sz = 2;
@@ -86,20 +86,20 @@ queue *new_queue(int sz)
     return q;
 }
 
-void free_queue(queue * q)
+void free_queue(nodequeue * q)
 {
     free(q->store);
     free(q);
 }
 
-void enqueue(queue * q, node_t * n)
+void enqueue(nodequeue * q, node_t * n)
 {
     *(q->tail++) = n;
     if (q->tail >= q->limit)
        q->tail = q->store;
 }
 
-node_t *dequeue(queue * q)
+node_t *dequeue(nodequeue * q)
 {
     node_t *n;
     if (q->head == q->tail)

diff --git a/lib/dotgen/cluster.c b/lib/dotgen/cluster.c
index 27a135acf88df6958b54cf9555f140d8584b3783..077318d25551cc7b8e01a784d06ec1fb495a7068 100644 (file)
--- a/lib/dotgen/cluster.c
+++ b/lib/dotgen/cluster.c
@@ -372,7 +372,7 @@ void build_skeleton(graph_t * g, graph_t * subg)
     }
 }
 
-void install_cluster(graph_t * g, node_t * n, int pass, queue * q)
+void install_cluster(graph_t * g, node_t * n, int pass, nodequeue * q)
 {
     int r;
     graph_t *clust;

diff --git a/lib/dotgen/dotprocs.h b/lib/dotgen/dotprocs.h
index ec2a0efcc535ee0065dd3ae3e11b9e9cc09f56ed..0c1582a94f03fcccc14d79a55f5ad798ac71e6cc 100644 (file)
--- a/lib/dotgen/dotprocs.h
+++ b/lib/dotgen/dotprocs.h
@@ -45,7 +45,7 @@ extern "C" {
     extern Agedge_t *find_flat_edge(Agnode_t *, Agnode_t *);
     extern void flat_edge(Agraph_t *, Agedge_t *);
     extern int flat_edges(Agraph_t *);
-    extern void install_cluster(Agraph_t *, Agnode_t *, int, queue *);
+    extern void install_cluster(Agraph_t *, Agnode_t *, int, nodequeue *);
     extern void install_in_rank(Agraph_t *, Agnode_t *);
     extern int is_cluster(Agraph_t *);
     extern void dot_compoundEdges(Agraph_t *);

diff --git a/lib/dotgen/mincross.c b/lib/dotgen/mincross.c
index dc93ff93d08c3ed54a8e77e80816327cc37d38ec..0c51ed08574743d5208b5b39403976ac2b9a58b4 100644 (file)
--- a/lib/dotgen/mincross.c
+++ b/lib/dotgen/mincross.c
@@ -860,7 +860,7 @@ void build_ranks(graph_t * g, int pass)
     int i, j;
     node_t *n, *n0;
     edge_t **otheredges;
-    queue *q;
+    nodequeue *q;
 
     q = new_queue(GD_n_nodes(g));
     for (n = GD_nlist(g); n; n = ND_next(n))
@@ -917,7 +917,7 @@ void build_ranks(graph_t * g, int pass)
     free_queue(q);
 }
 
-void enqueue_neighbors(queue * q, node_t * n0, int pass)
+void enqueue_neighbors(nodequeue * q, node_t * n0, int pass)
 {
     int i;
     edge_t *e;