diff options
author | Tom Tromey <tromey@redhat.com> | 2013-12-17 21:30:36 -0700 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:45:38 -0700 |
commit | 2e1e1a193c4207779a53ef02753cf7cbec3cf38c (patch) | |
tree | 8f9e1d6bcb21d9905fdb6b92ccf92d50e548e457 | |
parent | d2f640d43aee0be2d12eb082ac3d48d99ab5a1ce (diff) | |
download | gdb-2e1e1a193c4207779a53ef02753cf7cbec3cf38c.zip gdb-2e1e1a193c4207779a53ef02753cf7cbec3cf38c.tar.gz gdb-2e1e1a193c4207779a53ef02753cf7cbec3cf38c.tar.bz2 |
Add target_ops argument to to_terminal_ours_for_output
2014-02-19 Pedro Alves <palves@redhat.com>
Tom Tromey <tromey@redhat.com>
* target.h (struct target_ops) <to_terminal_ours_for_output>: Add
argument.
(target_terminal_ours_for_output): Add argument.
* target.c (debug_to_terminal_ours_for_output): Add argument.
(update_current_target): Update.
* inflow.c (terminal_ours_for_output): Add 'self' argument.
* inferior.h (terminal_ours_for_output): Add 'self' argument.
* go32-nat.c (go32_terminal_ours): Add 'self' argument.
-rw-r--r-- | gdb/ChangeLog | 12 | ||||
-rw-r--r-- | gdb/inferior.h | 2 | ||||
-rw-r--r-- | gdb/inflow.c | 2 | ||||
-rw-r--r-- | gdb/target.c | 8 | ||||
-rw-r--r-- | gdb/target.h | 4 |
5 files changed, 20 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a817e1b..175f9f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2014-02-19 Pedro Alves <palves@redhat.com> + Tom Tromey <tromey@redhat.com> + + * target.h (struct target_ops) <to_terminal_ours_for_output>: Add + argument. + (target_terminal_ours_for_output): Add argument. + * target.c (debug_to_terminal_ours_for_output): Add argument. + (update_current_target): Update. + * inflow.c (terminal_ours_for_output): Add 'self' argument. + * inferior.h (terminal_ours_for_output): Add 'self' argument. + * go32-nat.c (go32_terminal_ours): Add 'self' argument. + 2014-02-19 Tom Tromey <tromey@redhat.com> * target.h (struct target_ops) <to_terminal_inferior>: Add diff --git a/gdb/inferior.h b/gdb/inferior.h index 5acbee4..f298403 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -174,7 +174,7 @@ extern void child_terminal_info (const char *, int); extern void term_info (char *, int); -extern void terminal_ours_for_output (void); +extern void terminal_ours_for_output (struct target_ops *self); extern void terminal_inferior (struct target_ops *self); diff --git a/gdb/inflow.c b/gdb/inflow.c index 72706f5..8d9a7f3 100644 --- a/gdb/inflow.c +++ b/gdb/inflow.c @@ -353,7 +353,7 @@ terminal_inferior (struct target_ops *self) should be called to get back to a normal state of affairs. */ void -terminal_ours_for_output (void) +terminal_ours_for_output (struct target_ops *self) { terminal_ours_1 (1); } diff --git a/gdb/target.c b/gdb/target.c index f3a6b80..1f56a0a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -136,7 +136,7 @@ static void debug_to_terminal_init (struct target_ops *self); static void debug_to_terminal_inferior (struct target_ops *self); -static void debug_to_terminal_ours_for_output (void); +static void debug_to_terminal_ours_for_output (struct target_ops *self); static void debug_to_terminal_save_ours (void); @@ -775,7 +775,7 @@ update_current_target (void) (void (*) (struct target_ops *)) target_ignore); de_fault (to_terminal_ours_for_output, - (void (*) (void)) + (void (*) (struct target_ops *)) target_ignore); de_fault (to_terminal_ours, (void (*) (void)) @@ -4815,9 +4815,9 @@ debug_to_terminal_inferior (struct target_ops *self) } static void -debug_to_terminal_ours_for_output (void) +debug_to_terminal_ours_for_output (struct target_ops *self) { - debug_target.to_terminal_ours_for_output (); + debug_target.to_terminal_ours_for_output (&debug_target); fprintf_unfiltered (gdb_stdlog, "target_terminal_ours_for_output ()\n"); } diff --git a/gdb/target.h b/gdb/target.h index bb68ac0..ffe4919 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -489,7 +489,7 @@ struct target_ops CORE_ADDR, CORE_ADDR); void (*to_terminal_init) (struct target_ops *); void (*to_terminal_inferior) (struct target_ops *); - void (*to_terminal_ours_for_output) (void); + void (*to_terminal_ours_for_output) (struct target_ops *); void (*to_terminal_ours) (void); void (*to_terminal_save_ours) (void); void (*to_terminal_info) (const char *, int); @@ -1238,7 +1238,7 @@ extern void target_terminal_inferior (void); should be called to get back to a normal state of affairs. */ #define target_terminal_ours_for_output() \ - (*current_target.to_terminal_ours_for_output) () + (*current_target.to_terminal_ours_for_output) (¤t_target) /* Put our terminal settings into effect. First record the inferior's terminal settings |