X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fremote-adapt.c;h=9d31d52b8fc4c1cfe97830cefdb17da1199a865e;hb=b6849f55b93759fa93a28c749cee6b799000067e;hp=e73236520a594af3a65a02469e96f9743ce61ef7;hpb=b6ba6518e9254bc25f88088228e93ac966ebccd1;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/remote-adapt.c b/gdb/remote-adapt.c
index e73236520a..9d31d52b8f 100644
--- a/gdb/remote-adapt.c
+++ b/gdb/remote-adapt.c
@@ -309,12 +309,6 @@ get_hex_regs (int n, int regno)
 /* Called when SIGALRM signal sent due to alarm() timeout.  */
 #ifndef HAVE_TERMIO
 
-#ifndef __STDC__
-#ifndef volatile
-#define volatile
-/**/
-# endif
-#endif
 volatile int n_alarms;
 
 void
@@ -759,7 +753,7 @@ adapt_detach (char *args, int from_tty)
 /* Tell the remote machine to resume.  */
 
 void
-adapt_resume (int pid, int step, enum target_signal sig)
+adapt_resume (ptid_t ptid, int step, enum target_signal sig)
 {
   if (step)
     {
@@ -787,8 +781,8 @@ adapt_resume (int pid, int step, enum target_signal sig)
 /* Wait until the remote machine stops, then return,
    storing status in STATUS just as `wait' would.  */
 
-int
-adapt_wait (struct target_waitstatus *status)
+ptid_t
+adapt_wait (ptid_t ptid, struct target_waitstatus *status)
 {
   /* Strings to look for.  '?' means match any single character.  
      Note that with the algorithm we use, the initial character
@@ -821,7 +815,7 @@ adapt_wait (struct target_waitstatus *status)
       status->kind = TARGET_WAITKIND_STOPPED;
       status->value.sig = TARGET_SIGNAL_TRAP;
       need_artificial_trap--;
-      return 0;
+      return inferior_ptid;
     }
 
   timeout = 0;			/* Don't time out -- user program is running. */
@@ -877,7 +871,7 @@ adapt_wait (struct target_waitstatus *status)
     }
   timeout = old_timeout;
   immediate_quit = old_immediate_quit;
-  return 0;
+  return inferior_ptid;
 }
 
 /* Return the name of register number REGNO
@@ -1508,7 +1502,6 @@ init_adapt_ops (void)
   adapt_ops.to_thread_alive = 0;
   adapt_ops.to_stop = 0;	/* process_stratum; */
   adapt_ops.to_pid_to_exec_file = NULL;
-  adapt_ops.to_core_file_to_sym_file = NULL;
   adapt_ops.to_stratum = 0;
   adapt_ops.DONT_USE = 0;
   adapt_ops.to_has_all_memory = 1;