* remote-utils.c (prepare_resume_reply): Move declaration

	of gdb_id_from_wait to the top of the block.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a84b4784d57a45d0bfb396c31f8fb77efd434bb5..119736e762692b4a0e258c6e5e9c4d38d4b45c6a 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * remote-utils.c (prepare_resume_reply): Move declaration
+       of gdb_id_from_wait to the top of the block.
+
 2006-02-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * linux-low.c (regsets_store_inferior_registers): Read the regset

diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index c36570239f84f72a49aa14214d82b6edf6c3f15c..b8634e877fe31f8c64af702362647f9f7296f336 100644 (file)
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -681,9 +681,11 @@ prepare_resume_reply (char *buf, char status, unsigned char signo)
 
       if (using_threads)
        {
+         unsigned int gdb_id_from_wait;
+
          /* FIXME right place to set this? */
          thread_from_wait = ((struct inferior_list_entry *)current_inferior)->id;
-         unsigned int gdb_id_from_wait = thread_to_gdb_id (current_inferior);
+         gdb_id_from_wait = thread_to_gdb_id (current_inferior);
 
          if (debug_threads)
            fprintf (stderr, "Writing resume reply for %ld\n\n", thread_from_wait);