===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.63
retrieving revision 1.66
diff -u -p -r1.63 -r1.66
--- mandoc/html.c	2009/10/13 10:21:24	1.63
+++ mandoc/html.c	2009/10/26 08:18:15	1.66
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.63 2009/10/13 10:21:24 kristaps Exp $ */
+/*	$Id: html.c,v 1.66 2009/10/26 08:18:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <assert.h>
 #include <err.h>
@@ -29,6 +28,7 @@
 #include "out.h"
 #include "chars.h"
 #include "html.h"
+#include "main.h"
 
 #define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 
@@ -101,8 +101,8 @@ html_alloc(char *outopts)
 	if (NULL == (h = calloc(1, sizeof(struct html))))
 		return(NULL);
 
-	SLIST_INIT(&h->tags);
-	SLIST_INIT(&h->ords);
+	h->tags.head = NULL;
+	h->ords.head = NULL;
 
 	if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
 		free(h);
@@ -137,15 +137,13 @@ html_free(void *p)
 
 	h = (struct html *)p;
 
-	while ( ! SLIST_EMPTY(&h->ords)) {
-		ord = SLIST_FIRST(&h->ords);
-		SLIST_REMOVE_HEAD(&h->ords, entry);
+	while ((ord = h->ords.head) != NULL) { 
+		h->ords.head = ord->next;
 		free(ord);
 	}
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+	while ((tag = h->tags.head) != NULL) {
+		h->tags.head = tag->next;	
 		free(tag);
 	}
 	
@@ -357,7 +355,8 @@ print_otag(struct html *h, enum htmltag tag, 
 		if (NULL == (t = malloc(sizeof(struct tag))))
 			err(EXIT_FAILURE, "malloc");
 		t->tag = tag;
-		SLIST_INSERT_HEAD(&h->tags, t, entry);
+		t->next = h->tags.head;
+		h->tags.head = t;
 	} else
 		t = NULL;
 
@@ -467,10 +466,9 @@ print_tagq(struct html *h, const struct tag *until)
 {
 	struct tag	*tag;
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
+	while ((tag = h->tags.head) != NULL) {
 		print_ctag(h, tag->tag);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+		h->tags.head = tag->next;
 		free(tag);
 		if (until && tag == until)
 			return;
@@ -483,12 +481,11 @@ print_stagq(struct html *h, const struct tag *suntil)
 {
 	struct tag	*tag;
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
+	while ((tag = h->tags.head) != NULL) {
 		if (suntil && tag == suntil)
 			return;
 		print_ctag(h, tag->tag);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+		h->tags.head = tag->next;
 		free(tag);
 	}
 }
@@ -649,3 +646,4 @@ bufcat_su(struct html *h, const char *p, const struct 
 		/* LINTED */
 		buffmt(h, "%s: %d%s;", p, (int)v, u);
 }
+