From 8ea20696b16166e027b7c652fd56890ef703d1ad Mon Sep 17 00:00:00 2001
From: Fredrik Noring <noring@nocrew.org>
Date: Wed, 29 Apr 1998 17:06:31 +0200
Subject: [PATCH] Renamed queue to pike_queue becuase of OS struct tag clash.
Rev: src/gc.c:1.38
Rev: src/gc.h:1.19
Rev: src/queue.c:1.2
Rev: src/queue.h:1.2
---
src/gc.c | 4 ++--
src/gc.h | 4 ++--
src/queue.c | 4 ++--
src/queue.h | 16 +++++++---------
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/gc.c b/src/gc.c
index 056dbb1a49..36a5de659b 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -25,7 +25,7 @@ struct callback *gc_evaluator_callback=0;
#include "main.h"
#include <math.h>
-RCSID("$Id: gc.c,v 1.37 1998/04/29 02:45:21 hubbe Exp $");
+RCSID("$Id: gc.c,v 1.38 1998/04/29 15:06:29 noring Exp $");
/* Run garbage collect approximate every time we have
* 20 percent of all arrays, objects and programs is
@@ -42,7 +42,7 @@ INT32 num_objects =0;
INT32 num_allocs =0;
INT32 alloc_threshold = MIN_ALLOC_THRESHOLD;
static int in_gc = 0;
-struct queue gc_mark_queue;
+struct pike_queue gc_mark_queue;
static double objects_alloced = 0.0;
static double objects_freed = 0.0;
diff --git a/src/gc.h b/src/gc.h
index 4a0400fed1..519e9fa288 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -1,5 +1,5 @@
/*
- * $Id: gc.h,v 1.18 1998/04/29 02:45:22 hubbe Exp $
+ * $Id: gc.h,v 1.19 1998/04/29 15:06:28 noring Exp $
*/
#ifndef GC_H
#define GC_H
@@ -8,7 +8,7 @@
#include "callback.h"
#include "queue.h"
-extern struct queue gc_mark_queue;
+extern struct pike_queue gc_mark_queue;
extern INT32 num_objects;
extern INT32 num_allocs;
extern INT32 alloc_threshold;
diff --git a/src/queue.c b/src/queue.c
index f2dc7fca66..f228d87199 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -17,7 +17,7 @@ struct queue_block
struct queue_entry entries[QUEUE_ENTRIES];
};
-void run_queue(struct queue *q)
+void run_queue(struct pike_queue *q)
{
struct queue_block *b;
while((b=q->first))
@@ -32,7 +32,7 @@ void run_queue(struct queue *q)
q->last=0;
}
-void enqueue(struct queue *q, queue_call call, void *data)
+void enqueue(struct pike_queue *q, queue_call call, void *data)
{
struct queue_block *b=q->last;
if(!b || b->used >= QUEUE_ENTRIES)
diff --git a/src/queue.h b/src/queue.h
index 2dc43f261b..4880ca27b5 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -1,20 +1,18 @@
#ifndef QUEUE_H
#define QUEUE_H
-struct queue;
+struct pike_queue
+{
+ struct queue_block *first, *last;
+};
+
typedef void (*queue_call)(void *data);
/* Prototypes begin here */
struct queue_entry;
struct queue_block;
-void run_queue(struct queue *q);
-void enqueue(struct queue *q, queue_call call, void *data);
+void run_queue(struct pike_queue *q);
+void enqueue(struct pike_queue *q, queue_call call, void *data);
/* Prototypes end here */
-struct queue
-{
- struct queue_block *first, *last;
-};
-
-
#endif /* QUEUE_H */
--
GitLab