Fix for PR gdb/209, PR gdb/156:

[deliverable/binutils-gdb.git] / gdb / proc-service.c

diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index 37ab1bd7dad9deb64e2fdc67a0ea3c9ec2fb9785..8d63e98219606ea77d7dfb843a3219dbe2850f8e 100644 (file)
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -51,11 +51,7 @@ typedef size_t gdb_ps_size_t;
 
 /* Building process ids.  */
 
-#ifndef MERGEPID
-#define MERGEPID(PID, TID)     (((PID) & 0xffff) | ((TID) << 16))
-#endif
-
-#define BUILD_LWP(tid, pid)    MERGEPID (pid, tid)
+#define BUILD_LWP(lwp, pid)    ptid_build (pid, lwp, 0)
 \f
 
 /* Helper functions.  */