2002-09-30 Elena Zannoni <ezannoni@redhat.com>

	* event-loop.c (start_event_loop): Rename variable 'result' to
	'gdb_result', to avoid conflicts with upcoming intepreters changes.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0c8030eade03177b186db87e064167f4650a9828..821b175aedd6d7f84c75bb019a1df37ad696ec67 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-30  Elena Zannoni  <ezannoni@redhat.com>
+
+       * event-loop.c (start_event_loop): Rename variable 'result' to
+       'gdb_result', to avoid conflicts with upcoming intepreters changes.
+
 2002-09-30  Keith Seitz  <keiths@redhat.com>
 
        * gdb-events.sh (selected_thread_changed): New event.
@@ -10,17 +15,18 @@
 
 2002-09-30  Fernando Nasser  <fnasser@redhat.com>
 
-       * disasm.c: New file.
-       * disasm.h: New file.
+       * disasm.c: New file.  
+       * disasm.h: New file.  
        * mi/mi-cmd-disas.c (gdb_dis_asm_read_memory): Moved to disasm.c.
        (compare_lines): Ditto.
        (dump_insns): Ditto.
-       (do_mixed_source_and_assembly): Moved to disasm.c. Added uiout argument.
+       (do_mixed_source_and_assembly): Moved to disasm.c. Added uiout
+       argument.
        (do_assembly_only): Ditto.
-       (do_disassembly): Renamed to gdb_disassembly and moved to disasm.c.
-       Sdded uiout argument.
-       * Makefile.in: Add new files.  Reorder SFILES list. Update dependencies.
-       Include libgdb.a later in the insight executable. 
+       (do_disassembly): Renamed to gdb_disassembly and moved to
+       disasm.c.  Sdded uiout argument.
+       * Makefile.in: Add new files.  Reorder SFILES list. Update
+       dependencies.  Include libgdb.a later in the insight executable.
 
 2002-09-29  Andrew Cagney  <ac131313@redhat.com>
 

diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 03eb41c6b1674df45ac2f06467e3ea27df09b455..0fa37c11f96d3e693fff9232a2e0352304480f30 100644 (file)
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -392,10 +392,12 @@ start_event_loop (void)
      longer any event sources registered. */
   while (1)
     {
-      int result = catch_errors (gdb_do_one_event, 0, "", RETURN_MASK_ALL);
-      if (result < 0)
+      int gdb_result;
+
+      gdb_result = catch_errors (gdb_do_one_event, 0, "", RETURN_MASK_ALL);
+      if (gdb_result < 0)
        break;
-      if (result == 0)
+      if (gdb_result == 0)
        {
          /* FIXME: this should really be a call to a hook that is
             interface specific, because interfaces can display the