On Thu, Jun 2, 2011 at 7:15 AM, Jan Kratochvil <jan.kratoch...@redhat.com> wrote: > > libiberty/ > 2011-05-24 Jan Kratochvil <jan.kratoch...@redhat.com> > > * cp-demangle.c (struct d_print_info): Remove field options. > (d_print_init): Remove parameter options. > (cplus_demangle_print_callback): Update all the callers. > (d_print_comp, d_print_mod_list, d_print_mod, d_print_function_type) > (d_print_array_type, d_print_expr_op, d_print_cast, d_print_subexpr): > Add parameter options, update all the callers.
> static void > -d_print_comp (struct d_print_info *, const struct demangle_component *); > +d_print_comp (struct d_print_info *, const struct demangle_component *, int); The new options parameter should be the second parameter, not the last. > static void > -d_print_mod_list (struct d_print_info *, struct d_print_mod *, int); > +d_print_mod_list (struct d_print_info *, struct d_print_mod *, int, int); Likewise. > static void > -d_print_mod (struct d_print_info *, const struct demangle_component *); > +d_print_mod (struct d_print_info *, const struct demangle_component *, int); Likewise. > static void > d_print_function_type (struct d_print_info *, > const struct demangle_component *, > - struct d_print_mod *); > + struct d_print_mod *, int); Likewise. > static void > d_print_array_type (struct d_print_info *, > const struct demangle_component *, > - struct d_print_mod *); > + struct d_print_mod *, int); Likewise. > static void > -d_print_expr_op (struct d_print_info *, const struct demangle_component *); > +d_print_expr_op (struct d_print_info *, const struct demangle_component *, > int); Likewise. > static void > -d_print_cast (struct d_print_info *, const struct demangle_component *); > +d_print_cast (struct d_print_info *, const struct demangle_component *, int); Likewise. You will have to change the function definitions and calls accordingly. This is OK with those changes. Thanks. Ian