===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- mandoc/roff.c	2011/01/01 16:18:39	1.117
+++ mandoc/roff.c	2011/01/02 10:10:57	1.118
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.117 2011/01/01 16:18:39 kristaps Exp $ */
+/*	$Id: roff.c,v 1.118 2011/01/02 10:10:57 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -86,9 +86,9 @@ struct	roff {
 	struct regset	*regs; /* read/writable registers */
 	struct roffstr	*first_string; /* user-defined strings & macros */
 	const char	*current_string; /* value of last called user macro */
-	struct tbl	*first_tbl; /* first table parsed */
-	struct tbl	*last_tbl; /* last table parsed */
-	struct tbl	*tbl; /* current table being parsed */
+	struct tbl_node	*first_tbl; /* first table parsed */
+	struct tbl_node	*last_tbl; /* last table parsed */
+	struct tbl_node	*tbl; /* current table being parsed */
 };
 
 struct	roffnode {
@@ -301,7 +301,7 @@ roffnode_push(struct roff *r, enum rofft tok, const ch
 static void
 roff_free1(struct roff *r)
 {
-	struct tbl	*t;
+	struct tbl_node	*t;
 
 	while (r->first_tbl) {
 		t = r->first_tbl;
@@ -1152,7 +1152,7 @@ roff_T_(ROFF_ARGS)
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {
-	struct tbl	*t;
+	struct tbl_node	*t;
 
 	if (r->tbl) {
 		(*r->msg)(MANDOCERR_SCOPEBROKEN, r->data, ln, ppos, NULL);