From: Andrew Cagney <cagney@redhat.com>
Date: Sat, 28 Jul 2001 22:44:53 +0000 (+0000)
Subject: Fix some PID/TPID fallout for HP/UX.
X-Git-Tag: gdb_5_1-2001-07-29-branchpoint~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de6ee55865039fb1c1f18d6cd404bee595998473;p=external%2Fbinutils.git

Fix some PID/TPID fallout for HP/UX.
From 2001-07-22 Rodney Brown <rbrown64@csc.com.au>:
* infttrace.c (ptrace_wait): Match external declaration,
and match target_post_wait declaration.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 223c0df..9bda34e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2001-07-28  Andrew Cagney  <ac131313@redhat.com>
 
+	Fix some PID/TPID fallout for HP/UX.
+	From 2001-07-22 Rodney Brown <rbrown64@csc.com.au>:
+	* infttrace.c (ptrace_wait): Match external declaration,
+	and match target_post_wait declaration.
+
+2001-07-28  Andrew Cagney  <ac131313@redhat.com>
+
 	* MAINTAINERS: Add Orjan Friberg as cris target maintainer.
 	(cris): Set --enable-gdb-build-warnings flag to -w.
 
diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index 5516459..00cdda2 100644
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -2596,7 +2596,7 @@ count_unhandled_events (int real_pid, lwpid_t real_tid)
  *
  * Note: used by core gdb and so uses the pseudo-pid (really tid).
  */
-ptid_t
+int
 ptrace_wait (ptid_t ptid, int *status)
 {
   ttstate_t tsp;
@@ -2621,13 +2621,13 @@ ptrace_wait (ptid_t ptid, int *status)
       if (errno == ESRCH)
 	{
 	  *status = 0;		/* WIFEXITED */
-	  return inferior_ptid;
+	  return PIDGET (inferior_ptid);
 	}
 
       warning ("Call of ttrace_wait returned with errno %d.",
 	       errno);
       *status = ttwait_return;
-      return inferior_ptid;
+      return PIDGET (inferior_ptid);
     }
 
   real_pid = tsp.tts_pid;
@@ -2888,7 +2888,7 @@ ptrace_wait (ptid_t ptid, int *status)
       *status = _SIGTRAP;
     }
 
-  target_post_wait (tsp.tts_pid, *status);
+  target_post_wait (pid_to_ptid (tsp.tts_pid), *status);
 
 
 #ifdef THREAD_DEBUG
@@ -2914,7 +2914,7 @@ ptrace_wait (ptid_t ptid, int *status)
       warning ("Internal error: process-wait failed.");
     }
 
-  return pid_to_ptid (return_pid);
+  return return_pid;
 }