> >So I suggest the following change, where I appended "tui_" to
> >the variable names to avoid the macro expansion (short of finding
> >a better replacement name).
> >
> >2004-02-23  J. Brobecker  <brobecker@gnat.com>
> >
> >        * tui-disasm.c: %s/lines/tui_lines/g to avoid a collision
> >        with the lines macro defined in term.h on AiX.
> 
> For this one I think "asm_lines" reads better.

Agreed.

> >        * tui-regs.c: %s/label_width/tui_label_width/g, to avoid
> >        a collision with the label_width macro defined in term.h on AiX.
> 
> For this one, yes, I can't think of anything better.  Suggest adding a 
> comment so that someone doesn't change it back.
> 
> Either way, obishly approved,
> Andrew

Thank you. Here is what I ended up checking in.

2004-02-24  J. Brobecker  <brobecker@gnat.com>

        * tui/tui-disasm.c: %s/lines/asm_lines/g to avoid a collision
        with the lines macro defined in term.h on AiX.
        * tui/tui-regs.c: %s/label_width/tui_label_width/g, to avoid
        a collision with the label_width macro defined in term.h on AiX.

-- 
Joel