(getopt): Allow full prototype when builind under FreeBSD.

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

diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index 74e81ae4b185e1ee47d314efc7bf1c0a6328f04a..d7cd1aaf91b433626c6f824b403fdd0ad54591b6 100644 (file)
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -1,5 +1,6 @@
 /* <proc_service.h> implementation.
-   Copyright 1999, 2000 Free Software Foundation, Inc.
+
+   Copyright 1999, 2000, 2002 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -51,33 +52,11 @@ 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.  */
 
-static void
-restore_inferior_ptid (void *arg)
-{
-  ptid_t *saved_pid_ptr = arg;
-  inferior_ptid = *saved_pid_ptr;
-  xfree (arg);
-}
-
-static struct cleanup *
-save_inferior_ptid (void)
-{
-  ptid_t *saved_ptid_ptr;
-
-  saved_ptid_ptr = xmalloc (sizeof (ptid_t));
-  *saved_ptid_ptr = inferior_ptid;
-  return make_cleanup (restore_inferior_ptid, saved_ptid_ptr);
-}
-
 /* Transfer LEN bytes of memory between BUF and address ADDR in the
    process specified by PH.  If WRITE, transfer them to the process,
    else transfer them from the process.  Returns PS_OK for success,
@@ -316,8 +295,8 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
   return PS_OK;
 }
 
-/* Return overall process id of the target PH.
-   Special for Linux -- not used on Solaris.  */
+/* Return overall process id of the target PH.  Special for GNU/Linux
+   -- not used on Solaris.  */
 
 pid_t
 ps_getpid (gdb_ps_prochandle_t ph)