* infrun.c (handle_inferior_event): Move the declaration of

        real_stop_pc inside the if blocks where it is used.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c4504ba2c9668a950e88d0f7d7c90842f02f262..144230323695906222f181db5c92e932a5290f8d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-03  J. Brobecker  <brobecker@gnat.com>
+
+       * infrun.c (handle_inferior_event): Move the declaration of
+       real_stop_pc inside the if blocks where it is used.
+
 2004-01-03  Mark Kettenis  <kettenis@gnu.org>
 
        * sparc64-tdep.c (sparc64_16_byte_align_p)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index b16cc62091f5574d70ec1994b03770d1a0e34fef..a42dad00571b11b03bb4246f06e60ee3bb7bdda8 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1244,7 +1244,6 @@ pc_in_sigtramp (CORE_ADDR pc)
 void
 handle_inferior_event (struct execution_control_state *ecs)
 {
-  CORE_ADDR real_stop_pc;
   /* NOTE: cagney/2003-03-28: If you're looking at this code and
      thinking that the variable stepped_after_stopped_by_watchpoint
      isn't used, then you're wrong!  The macro STOPPED_BY_WATCHPOINT,
@@ -2479,6 +2478,7 @@ process_event_stop_test:
       || ecs->stop_func_name == 0)
     {
       /* It's a subroutine call.  */
+      CORE_ADDR real_stop_pc;
 
       if ((step_over_calls == STEP_OVER_NONE)
          || ((step_range_end == 1)
@@ -2582,7 +2582,7 @@ process_event_stop_test:
   if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name))
     {
       /* Determine where this trampoline returns.  */
-      real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
+      CORE_ADDR real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc);
 
       /* Only proceed through if we know where it's going.  */
       if (real_stop_pc)