Change the way that the queue(3) structures are declared; don't assume that

the type argument to *_HEAD and *_ENTRY is a struct.

Suggested by:	phk
Reviewed by:	phk
Approved by:	mdodd

2 files changed, 4 insertions, 4 deletions

diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index 9565915..24e57fa 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -471,7 +471,7 @@ struct rarr {
 #ifdef I4B_EXTERNAL_MONITOR
 /* for each rights entry we keep one of this structures around: */
 struct monitor_rights {
-	TAILQ_ENTRY(monitor_rights) list;	/* a list of this structures */
+	TAILQ_ENTRY(struct monitor_rights) list; /* a list of this structures */
 	char name[FILENAME_MAX];	/* net/host spec or filename */
 	int rights;			/* bitmask of allowed acces rights */
 	u_int32_t net;			/* net/host address (host byte order!) */
diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c
index dd6d2cd..79d7ed0 100644
--- a/usr.sbin/i4b/isdnd/monitor.c
+++ b/usr.sbin/i4b/isdnd/monitor.c
@@ -75,21 +75,21 @@ void monitor_fixup_rights()
 #endif
 
 
-static TAILQ_HEAD(rights_q, monitor_rights) rights = TAILQ_HEAD_INITIALIZER(rights);
+static TAILQ_HEAD(rights_q, struct monitor_rights) rights = TAILQ_HEAD_INITIALIZER(rights);
 
 static struct monitor_rights * local_rights = NULL;	/* entry for local socket */
 
 /* for each active monitor connection we have one of this: */
 
 struct monitor_connection {
-	TAILQ_ENTRY(monitor_connection) connections;
+	TAILQ_ENTRY(struct monitor_connection) connections;
 	int sock;			/* socket for this connection */
 	int rights;			/* active rights for this connection */
 	int events;			/* bitmask of events client is interested in */
 	char source[FILENAME_MAX];
 };
 
-static TAILQ_HEAD(connections_tq, monitor_connection) connections = TAILQ_HEAD_INITIALIZER(connections);
+static TAILQ_HEAD(connections_tq, struct monitor_connection) connections = TAILQ_HEAD_INITIALIZER(connections);
 
 /* local prototypes */
 static int cmp_rights(const struct monitor_rights *pa, const struct monitor_rights *pb);