diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-08-02 11:58:29 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-08-02 11:58:29 +0000 |
| commit | b5de0fa7413a260aa570079b5d168ea8781dac4e (patch) | |
| tree | da73221e5caa8c41d608a30460fa7f7eb8ebc60d /gdb/tui | |
| parent | a2bea4c366ef8a353e60d60cdcd754d17ca89e9c (diff) | |
| download | gdb-b5de0fa7413a260aa570079b5d168ea8781dac4e.zip gdb-b5de0fa7413a260aa570079b5d168ea8781dac4e.tar.gz gdb-b5de0fa7413a260aa570079b5d168ea8781dac4e.tar.bz2 | |
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.
Diffstat (limited to 'gdb/tui')
| -rw-r--r-- | gdb/tui/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/tui/tuiDisassem.c | 2 | ||||
| -rw-r--r-- | gdb/tui/tuiSource.c | 2 | ||||
| -rw-r--r-- | gdb/tui/tuiSourceWin.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index 42ed336..7c51d2d 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,11 @@ +2001-08-02 Eli Zaretskii <eliz@is.elta.co.il> + + * tuiSourceWin.c: Use disp_del instead of del. + + * tuiSource.c: Use disp_del instead of del. + + * tuiDisassem.c: Use disp_del instead of del. + 2001-07-31 Stephane Carrez <Stephane.Carrez@worldnet.fr> * tui.c (tui_enable): Remove call to terminal_save_ours(). diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c index 7bdcbf7..9766bbb 100644 --- a/gdb/tui/tuiDisassem.c +++ b/gdb/tui/tuiDisassem.c @@ -120,7 +120,7 @@ extern void strcat_address_numeric (CORE_ADDR, int, char *, int); element->whichElement.source.hasBreak = (bp != (struct breakpoint *) NULL && (!element->whichElement.source.isExecPoint || - (bp->disposition != del || bp->hit_count <= 0))); + (bp->disposition != disp_del || bp->hit_count <= 0))); curLine++; pc = newpc; /* reset the buffer to empty */ diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tuiSource.c index 6c1a8fb..5dc5ade 100644 --- a/gdb/tui/tuiSource.c +++ b/gdb/tui/tuiSource.c @@ -172,7 +172,7 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror) element->whichElement.source.hasBreak = (bp != (struct breakpoint *) NULL && (!element->whichElement.source.isExecPoint || - (bp->disposition != del || bp->hit_count <= 0))); + (bp->disposition != disp_del || bp->hit_count <= 0))); if (c != EOF) { i = strlen (srcLine) - 1; diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tuiSourceWin.c index b79404d..1fb0ddf 100644 --- a/gdb/tui/tuiSourceWin.c +++ b/gdb/tui/tuiSourceWin.c @@ -583,7 +583,7 @@ tuiSetExecInfoContent (TuiWinInfoPtr winInfo) srcElement->whichElement.source.lineOrAddr.addr); if (found) srcElement->whichElement.source.hasBreak = - (bp->disposition != del || bp->hit_count <= 0); + (bp->disposition != disp_del || bp->hit_count <= 0); } if (!found) srcElement->whichElement.source.hasBreak = FALSE; |