diff --git a/src/include/mpool.h b/src/include/mpool.h index fb33d449..50916adb 100644 --- a/src/include/mpool.h +++ b/src/include/mpool.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpool.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ +/* $OpenBSD: mpool.h,v 1.11 2013/12/02 02:28:21 krw Exp $ */ /* $NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $ */ /*- @@ -49,8 +49,8 @@ /* The BKT structures are the elements of the queues. */ typedef struct _bkt { - CIRCLEQ_ENTRY(_bkt) hq; /* hash queue */ - CIRCLEQ_ENTRY(_bkt) q; /* lru queue */ + TAILQ_ENTRY(_bkt) hq; /* hash queue */ + TAILQ_ENTRY(_bkt) q; /* lru queue */ void *page; /* page */ pgno_t pgno; /* page number */ @@ -61,9 +61,9 @@ typedef struct _bkt { } BKT; typedef struct MPOOL { - CIRCLEQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */ + TAILQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */ /* hash queue array */ - CIRCLEQ_HEAD(_hqh, _bkt) hqh[HASHSIZE]; + TAILQ_HEAD(_hqh, _bkt) hqh[HASHSIZE]; pgno_t curcache; /* current number of cached pages */ pgno_t maxcache; /* max number of cached pages */ pgno_t npages; /* number of pages in the file */