=================================================================== RCS file: /cvs/mandoc/mdoc.h,v retrieving revision 1.109 retrieving revision 1.110 diff -u -p -r1.109 -r1.110 --- mandoc/mdoc.h 2010/12/22 11:15:16 1.109 +++ mandoc/mdoc.h 2010/12/24 14:00:40 1.110 @@ -1,4 +1,4 @@ -/* $Id: mdoc.h,v 1.109 2010/12/22 11:15:16 kristaps Exp $ */ +/* $Id: mdoc.h,v 1.110 2010/12/24 14:00:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -365,15 +365,6 @@ union mdoc_data { struct mdoc_bl Bl; }; -/* - * Reference-counted structure for containing normalised arguments of - * certain macros (those listed in union mdoc_data). - */ -struct mdoc_norm { - int refcnt; - union mdoc_data d; -}; - /* * Single node in tree-linked AST. */ @@ -396,7 +387,7 @@ struct mdoc_node { #define MDOC_ENDED (1 << 5) /* rendering has been ended */ enum mdoc_type type; /* AST node type */ enum mdoc_sec sec; /* current named section */ - struct mdoc_norm *norm; /* ref-counted, normalised args */ + union mdoc_data *norm; /* normalised args */ /* FIXME: these can be union'd to shave a few bytes. */ struct mdoc_arg *args; /* BLOCK/ELEM */ struct mdoc_node *pending; /* BLOCK */