Add target_ops argument to to_terminal_save_ours

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_terminal_save_ours>: Add
	argument.
	(target_terminal_save_ours): Add argument.
	* target.c (debug_to_terminal_save_ours): Add argument.
	(update_current_target): Update.
	* inflow.c (terminal_save_ours): Add 'self' argument.
	* inferior.h (terminal_save_ours): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f7a5d307b5d698775026baab604906b61b3c7e17..6447a3945a3ce1ef46979b8f01ae2cd855b27606 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_terminal_save_ours>: Add
+       argument.
+       (target_terminal_save_ours): Add argument.
+       * target.c (debug_to_terminal_save_ours): Add argument.
+       (update_current_target): Update.
+       * inflow.c (terminal_save_ours): Add 'self' argument.
+       * inferior.h (terminal_save_ours): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_terminal_ours>: Add argument.

diff --git a/gdb/inferior.h b/gdb/inferior.h
index c577fb4b86d05871f9adfc1095cfc13a8453a657..938933f6c2b7ed49775de3263f646378207e4034 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -125,7 +125,7 @@ extern int disable_randomization;
 
 extern void generic_mourn_inferior (void);
 
-extern void terminal_save_ours (void);
+extern void terminal_save_ours (struct target_ops *self);
 
 extern void terminal_ours (struct target_ops *self);
 

diff --git a/gdb/inflow.c b/gdb/inflow.c
index 087cc6040229cb7d0ca22516412b7f00f4d78071..fc5a716a38a467dd2b5fd41247c8a7116cd862c0 100644 (file)
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -245,7 +245,7 @@ terminal_init_inferior_with_pgrp (int pgrp)
    and gdb must be able to restore it correctly.  */
 
 void
-terminal_save_ours (void)
+terminal_save_ours (struct target_ops *self)
 {
   if (gdb_has_a_terminal ())
     {

diff --git a/gdb/target.c b/gdb/target.c
index ddb7c6350286d0800a562380b17ce12b89301534..9a0dfc3799ed32eb056c7a349a230daf1465901c 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -138,7 +138,7 @@ static void debug_to_terminal_inferior (struct target_ops *self);
 
 static void debug_to_terminal_ours_for_output (struct target_ops *self);
 
-static void debug_to_terminal_save_ours (void);
+static void debug_to_terminal_save_ours (struct target_ops *self);
 
 static void debug_to_terminal_ours (struct target_ops *self);
 
@@ -781,7 +781,7 @@ update_current_target (void)
            (void (*) (struct target_ops *))
            target_ignore);
   de_fault (to_terminal_save_ours,
-           (void (*) (void))
+           (void (*) (struct target_ops *))
            target_ignore);
   de_fault (to_terminal_info,
            default_terminal_info);
@@ -4831,9 +4831,9 @@ debug_to_terminal_ours (struct target_ops *self)
 }
 
 static void
-debug_to_terminal_save_ours (void)
+debug_to_terminal_save_ours (struct target_ops *self)
 {
-  debug_target.to_terminal_save_ours ();
+  debug_target.to_terminal_save_ours (&debug_target);
 
   fprintf_unfiltered (gdb_stdlog, "target_terminal_save_ours ()\n");
 }

diff --git a/gdb/target.h b/gdb/target.h
index e835029d0f7d5c966d828a0be1043c38fcfdb274..c4a52fb7b0bebfd44f9f115c74554501921705ea 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -491,7 +491,7 @@ struct target_ops
     void (*to_terminal_inferior) (struct target_ops *);
     void (*to_terminal_ours_for_output) (struct target_ops *);
     void (*to_terminal_ours) (struct target_ops *);
-    void (*to_terminal_save_ours) (void);
+    void (*to_terminal_save_ours) (struct target_ops *);
     void (*to_terminal_info) (const char *, int);
     void (*to_kill) (struct target_ops *);
     void (*to_load) (char *, int);
@@ -1253,7 +1253,7 @@ extern void target_terminal_inferior (void);
    to take this change into account.  */
 
 #define target_terminal_save_ours() \
-     (*current_target.to_terminal_save_ours) ()
+     (*current_target.to_terminal_save_ours) (&current_target)
 
 /* Print useful information about our terminal status, if such a thing
    exists.  */