The following changes avoid polluting global namespace with the
`enable' and `disable' identifiers, because some platforms define in their system headers symbols with global scope that go by those names. * breakpoint.h (enum enable_state): Rename from `enum enable'. Also rename all the enum members to have the "bp_" prefix. (struct breakpoint): Rename the `enable' member to `enable_state'. (enum bpdisp): Rename all members to have the "disp_" prefix. * breakpoint.c: All users of `enum enable' and `enum bpdisp' changed. (args_for_catchpoint_enable): Rename the `enable' member to `enable_p'. All users changed. * tracepoint.h (enum enable): Remove. (struct tracepoint): The member `enabled' is now `int enabled_p'. * tracepoint.c: All users of the `enabled' member changed. * printcmd.c (struct display): The `status' member is now an int. * memattr.h (struct mem_region): Rename the `status' member to `enabled_p'. (enum enable): Remove. * memattr.c: Change all users of the `status' member of struct mem_region to use `enabled_p' instead. * infcmd.c (run_stack_dummy): Use disp_del instead of del. * go32-nat.c: Remove the kludgey work-around for conflicts between <dos.h> and "breakpoint.h". * tui/tuiSourceWin.c: Use disp_del instead of del. * tui/tuiSource.c: Use disp_del instead of del. * tui/tuiDisassem.c: Use disp_del instead of del.
This commit is contained in:
parent
a2bea4c366
commit
b5de0fa741
14 changed files with 198 additions and 173 deletions
|
@ -357,7 +357,7 @@ set_raw_tracepoint (struct symtab_and_line sal)
|
|||
t->language = current_language->la_language;
|
||||
t->input_radix = input_radix;
|
||||
t->line_number = sal.line;
|
||||
t->enabled = enabled;
|
||||
t->enabled_p = 1;
|
||||
t->next = 0;
|
||||
t->step_count = 0;
|
||||
t->pass_count = 0;
|
||||
|
@ -494,7 +494,7 @@ tracepoints_info (char *tpnum_exp, int from_tty)
|
|||
}
|
||||
|
||||
printf_filtered ("%-3d %-3s ", t->number,
|
||||
t->enabled == enabled ? "y" : "n");
|
||||
t->enabled_p ? "y" : "n");
|
||||
if (addressprint)
|
||||
{
|
||||
char *tmp;
|
||||
|
@ -569,11 +569,11 @@ tracepoint_operation (struct tracepoint *t, int from_tty,
|
|||
switch (opcode)
|
||||
{
|
||||
case enable_op:
|
||||
t->enabled = enabled;
|
||||
t->enabled_p = 1;
|
||||
tracepoint_modify_event (t->number);
|
||||
break;
|
||||
case disable_op:
|
||||
t->enabled = disabled;
|
||||
t->enabled_p = 0;
|
||||
tracepoint_modify_event (t->number);
|
||||
break;
|
||||
case delete_op:
|
||||
|
@ -1735,7 +1735,7 @@ trace_start_command (char *args, int from_tty)
|
|||
|
||||
sprintf_vma (tmp, t->address);
|
||||
sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, tmp, /* address */
|
||||
t->enabled == enabled ? 'E' : 'D',
|
||||
t->enabled_p ? 'E' : 'D',
|
||||
t->step_count, t->pass_count);
|
||||
|
||||
if (t->actions)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue