===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mandoc/term.h	2009/02/25 12:09:20	1.6
+++ mandoc/term.h	2009/02/25 12:27:37	1.7
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.6 2009/02/25 12:09:20 kristaps Exp $ */
+/* $Id: term.h,v 1.7 2009/02/25 12:27:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -43,15 +43,15 @@ struct	termp {
 struct	termpair {
 	int		  type;
 #define	TERMPAIR_FLAG	 (1 << 0)
-	union {
-		int	  flag;
-	} data;
+	int	  	  flag;
+	size_t	  	  offset;
 };
 
 #define	TERMPAIR_SETFLAG(p, fl) \
 	do { \
-		(p)->data.flag = (fl); \
-		(p)->type = TERMPAIR_FLAG; \
+		assert(! (TERMPAIR_FLAG & (p)->type)); \
+		(p)->flag = (fl); \
+		(p)->type |= TERMPAIR_FLAG; \
 	} while (0)
 
 struct	termact {