diff --git a/src/gc.c b/src/gc.c index 056dbb1a49c839960ff08964ac838216795b5bae..36a5de659b98260e0a8245cdd5934e0142040254 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 4a0400fed17c42b343ed5f3a6ba35895808331c2..519e9fa288e42e23f5f1f04628d510a35c1429f5 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 f2dc7fca66b51c5815c78a6ee81ef8b60be9626c..f228d871999fbd651dc105b191408cefae453b8b 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 2dc43f261b6216cf28b7c3e07bc5471fc96e4b2f..4880ca27b550d7964aac7cad51ca5d542b3a4360 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 */