* remote-udi.c (udi_resume): Correct prototype.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e7d4623..df8384c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 11 14:27:03 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+       * remote-udi.c (udi_resume): Correct prototype.
+
 Tue Jan 11 11:10:30 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
         * config/pa/tm-hppa.h (FRAME_FIND_SAVED_REGS): Call
@@ -51,7 +55,6 @@ Mon Jan 10 15:48:36 1994  Tom Lord  (lord@rtl.cygnus.com)
        * m68k-stub.c, sparc-stub.c: removed spurious introduction of 
        _filtered io routines from these two files.
 
->>>>>>> 1.2095
 Fri Jan  7 12:42:45 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
        * config/i386/tm-i386v.h, config/m68k/tm-m68k.h, config/mips/tm-mips.h,

diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index 1c6bece..c51c875 100644 (file)
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -52,7 +52,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 extern int stop_soon_quietly;           /* for wait_for_inferior */
 extern struct value *call_function_by_hand();
-static void udi_resume PARAMS ((int pid, int step, int sig));
+static void udi_resume PARAMS ((int pid, int step, enum target_signal sig));
 static void udi_fetch_registers PARAMS ((int regno));
 static void udi_load PARAMS ((char *args, int from_tty));
 static void fetch_register PARAMS ((int regno));