* gdb_proc_service.h: Add copyright notice.

Protect against multiple inclusion.
Add fix for broken prfpregset_t here.
(struct ps_prochandle): Declare here.
[HAVE_PROC_SERVICE_H]: Include <proc_service.h>.
[!HAVE_PROC_SERVICE_H]: Include "gregset.h", define prgregset_t
and prfpregset_t in terms of gdb_gregset_t and gdb_fpregset_t if
necessary.
* lin-thread.c: Unconditionally include "gdb_proc_service.h".
Remove fix for broken prfpregset_t here.
(struct ps_prochandle): Don't declare here.

1 files changed, 70 insertions, 17 deletions

diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
index 1f1ff9e6f05..e77cdf6cd80 100644
--- a/gdb/gdb_proc_service.h
+++ b/gdb/gdb_proc_service.h
@@ -1,19 +1,51 @@
-typedef enum {
-  PS_OK,          /* generic "call succeeded" */
-  PS_ERR,         /* generic. */
-  PS_BADPID,      /* bad process handle */
-  PS_BADLID,      /* bad lwp identifier */
-  PS_BADADDR,     /* bad address */
-  PS_NOSYM,       /* p_lookup() could not find given symbol */
-        PS_NOFREGS
-  /*
-   * FPU register set not available for given
-   * lwp
-   */
-}       ps_err_e;
+/* <proc_service.h> replacement for systems that don't have it.
+   Copyright 2000 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef GDB_PROC_SERVICE_H
+#define GDB_PROC_SERVICE_H
+
+#include <sys/types.h>
+
+#ifdef HAVE_PROC_SERVICE_H
+#include <proc_service.h>
+#else
+
+#ifdef HAVE_SYS_PROCFS_H
+#include <sys/procfs.h>
+#endif
+
+#include "gregset.h"
+
+typedef enum
+{
+  PS_OK,			/* Success.  */
+  PS_ERR,			/* Generic error.  */
+  PS_BADPID,			/* Bad process handle.  */
+  PS_BADLID,			/* Bad LWP id.  */
+  PS_BADADDR,			/* Bad address.  */
+  PS_NOSYM,			/* Symbol not found.  */
+  PS_NOFREGS			/* FPU register set not available.  */
+} ps_err_e;
 
 #ifndef HAVE_LWPID_T
-typedef unsigned int  lwpid_t;
+typedef unsigned int lwpid_t;
 #endif
 
 typedef unsigned long paddr_t;
@@ -23,11 +55,32 @@ typedef unsigned long psaddr_t;
 #endif
 
 #ifndef HAVE_PRGREGSET_T
-typedef gregset_t  prgregset_t;		/* BOGUS BOGUS BOGUS */
+typedef gdb_gregset_t prgregset_t;
 #endif
 
 #ifndef HAVE_PRFPREGSET_T
-typedef fpregset_t prfpregset_t;	/* BOGUS BOGUS BOGUS */
+typedef gdb_fpregset_t prfpregset_t;
+#endif
+
+#endif /* HAVE_PROC_SERVICE_H */
+
+/* Fix-up some broken systems.  */
+
+/* Unfortunately glibc 2.1.3 was released with a broken prfpregset_t
+   type.  We let configure check for this lossage, and make
+   appropriate typedefs here.  */
+
+#ifdef PRFPREGSET_T_BROKEN
+typedef gdb_fpregset_t gdb_prfpregset_t;
+#else
+typedef prfpregset_t gdb_prfpregset_t;
 #endif
 
-struct ps_prochandle;		/* user defined. */
+/* Structure that identifies the target process.  */
+struct ps_prochandle
+{
+  /* The process id is all we need.  */
+  pid_t pid;
+};
+
+#endif /* gdb_proc_service.h */