Back out the previous change to the queue(3) interface.

It was not discussed and should probably not happen.

Requested by:		msmith and others

4 files changed, 8 insertions, 8 deletions

diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 3579233..890c714 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -13,13 +13,13 @@
 */
 
 struct callback {
-    LIST_ENTRY(struct callback) chain;
+    LIST_ENTRY(callback) chain;
     u_long vec;
     callback_t func;
     char *name;
 };
 
-LIST_HEAD(cbhead, struct callback) cbhead[127];
+LIST_HEAD(cbhead , callback) cbhead[127];
 
 #define	CBHASH(x)	(((x) * 17) % 127)
 
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index fd53125..e7d5f8b 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -68,13 +68,13 @@ struct http_state {
 };
 
 struct http_auth {
-	TAILQ_ENTRY(struct http_auth) ha_link;
+	TAILQ_ENTRY(http_auth) ha_link;
 	char *ha_scheme;
 	char *ha_realm;
 	char *ha_params;
 	const struct http_auth_method *ha_ham;
 };
-TAILQ_HEAD(http_auth_head, struct http_auth);
+TAILQ_HEAD(http_auth_head, http_auth);
 
 static int http_parse(struct fetch_state *fs, const char *uri);
 static int http_proxy_parse(struct fetch_state *fs, const char *uri);
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 719f116..c87f696 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -74,12 +74,12 @@ typedef struct arg {
 } ARG;
 ARG	*arglist;				/* head of linked list */
 
-LIST_HEAD(ttylisthead, struct ttytab) ttylist;
+LIST_HEAD(ttylisthead, ttytab) ttylist;
 
 struct ttytab {
 	time_t	logout;				/* log out time */
 	char	tty[UT_LINESIZE + 1];		/* terminal name */
-	LIST_ENTRY(struct ttytab) list;
+	LIST_ENTRY(ttytab) list;
 };
 
 static long	currentout,			/* current logout value */
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index 22cdc93..4a082e4 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -373,9 +373,9 @@ found:
 /*
  * The queue of tags generated by the last findgtag() call.
  */
-static CIRCLEQ_HEAD(gtag_q, struct gtag) gtag_q;
+static CIRCLEQ_HEAD(gtag_q, gtag) gtag_q;
 struct gtag {
-	CIRCLEQ_ENTRY(struct gtag) ptrs;
+	CIRCLEQ_ENTRY(gtag) ptrs;
 	char *file;	/* source file containing the tag */
 	int line;	/* appropriate line number of source file */
 };