Index: ChangeLog =================================================================== RCS file: /cvsroot/bison/bison/ChangeLog,v retrieving revision 1.173.2.4 diff -u -r1.173.2.4 ChangeLog --- ChangeLog 2001/08/16 20:48:02 1.173.2.4 +++ ChangeLog 2001/08/23 21:49:54 @@ -1,3 +1,10 @@ +2001-08-23 Marc Autret + + * src/print_graph.c (node_output_size): Declared POSIX `size_t' type, + instead of `unsigned'. + (print_state): Donnot call obstack_object_size () in obstack_grow () + to avoid macro variables shadowing. + 2001-08-16 Marc Autret * src/reader.c (parse_dquoted_param): New. Index: src/print_graph.c =================================================================== RCS file: /cvsroot/bison/bison/src/print_graph.c,v retrieving revision 1.6 diff -u -r1.6 print_graph.c --- src/print_graph.c 2001/08/08 20:31:21 1.6 +++ src/print_graph.c 2001/08/23 21:49:55 @@ -36,7 +36,7 @@ static graph_t graph; -static unsigned node_output_size = 0; +static size_t node_output_size = 0; /* Return an unambiguous printable representated, allocated in slot 0, for NAME, suitable for C strings. */ @@ -246,10 +246,15 @@ } /* `obstack_cat' NODE_OBSTACK to GRAPH_OBSTACK. */ - obstack_grow (&graph_obstack, - obstack_base (&node_obstack), - obstack_object_size (&node_obstack)); - obstack_finish (&node_obstack); + { + size_t obs_size; + + obs_size = obstack_object_size (&node_obstack); + obstack_grow (&graph_obstack, + obstack_base (&node_obstack), + obs_size); + obstack_finish (&node_obstack); + } }