gdb/

	PR build/14003
	* inferior.h (struct inferior_suspend_state): Comment out.
	(struct inferior): Comment out the field suspend.
	* infrun.c (struct infcall_suspend_state): Comment out the field
	inferior_suspend.
	(save_infcall_suspend_state, restore_infcall_suspend_state): Comment
	out its assignment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ee7e9cb093ba1f98fe8c084b77fccc2183e40318..fc59c2a97cff5fe34667e4fc67a285404ee54bce 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       PR build/14003
+       * inferior.h (struct inferior_suspend_state): Comment out.
+       (struct inferior): Comment out the field suspend.
+       * infrun.c (struct infcall_suspend_state): Comment out the field
+       inferior_suspend.
+       (save_infcall_suspend_state, restore_infcall_suspend_state): Comment
+       out its assignment.
+
 2012-06-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        PR c++/14177 - Fix parsing TYPENAME:: in parentheses.

diff --git a/gdb/inferior.h b/gdb/inferior.h
index dfcbda4c2f9016444cad1b6645ca284b115d42a2..394596251ff41a957feba3d4fe0a9dabf4c3a1ab 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -397,9 +397,11 @@ struct inferior_control_state
 
    Inferior thread counterpart is `struct thread_suspend_state'.  */
 
+#if 0 /* Currently unused and empty structures are not valid C.  */
 struct inferior_suspend_state
 {
 };
+#endif
 
 /* GDB represents the state of each program execution with an object
    called an inferior.  An inferior typically corresponds to a process
@@ -431,7 +433,9 @@ struct inferior
 
   /* State of inferior process to restore after GDB is done with an inferior
      call.  See `struct inferior_suspend_state'.  */
+#if 0 /* Currently unused and empty structures are not valid C.  */
   struct inferior_suspend_state suspend;
+#endif
 
   /* True if this was an auto-created inferior, e.g. created from
      following a fork; false, if this inferior was manually added by

diff --git a/gdb/infrun.c b/gdb/infrun.c
index e36e42e874160ac8f090bdd914e3d8105fd66ba9..d40ba3e097c3499fdca6430c77103cf74377eb1d 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6629,7 +6629,9 @@ siginfo_make_value (struct gdbarch *gdbarch, struct internalvar *var,
 struct infcall_suspend_state
 {
   struct thread_suspend_state thread_suspend;
+#if 0 /* Currently unused and empty structures are not valid C.  */
   struct inferior_suspend_state inferior_suspend;
+#endif
 
   /* Other fields:  */
   CORE_ADDR stop_pc;
@@ -6683,7 +6685,9 @@ save_infcall_suspend_state (void)
     }
 
   inf_state->thread_suspend = tp->suspend;
+#if 0 /* Currently unused and empty structures are not valid C.  */
   inf_state->inferior_suspend = inf->suspend;
+#endif
 
   /* run_inferior_call will not use the signal due to its `proceed' call with
      GDB_SIGNAL_0 anyway.  */
@@ -6707,7 +6711,9 @@ restore_infcall_suspend_state (struct infcall_suspend_state *inf_state)
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
 
   tp->suspend = inf_state->thread_suspend;
+#if 0 /* Currently unused and empty structures are not valid C.  */
   inf->suspend = inf_state->inferior_suspend;
+#endif
 
   stop_pc = inf_state->stop_pc;