* strerror.c: Revert last change. Declare static sys_nerr

[deliverable/binutils-gdb.git] / gdb / procfs.c

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 969bbcb2b614aa921cf8610a35ec6f9728e13abf..a92b849706004e906096cc083c6ef54174f03359 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1,5 +1,8 @@
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
-   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
+   Inc.
+
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
 
@@ -39,7 +42,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/syscall.h>
 #endif
 #include <sys/errno.h>
-#include <sys/wait.h>
+#include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_assert.h"
@@ -3702,8 +3705,8 @@ procfs_fetch_registers (int regno)
     {
       if ((regno >= 0 && regno < FP0_REGNUM) ||
          regno == PC_REGNUM  ||
-         (NPC_REGNUM >= 0 && regno == NPC_REGNUM) ||
-         regno == FP_REGNUM  ||
+         (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) ||
+         regno == DEPRECATED_FP_REGNUM  ||
          regno == SP_REGNUM)
        return;                 /* not a floating point register */
 
@@ -3776,8 +3779,8 @@ procfs_store_registers (int regno)
     {
       if ((regno >= 0 && regno < FP0_REGNUM) ||
          regno == PC_REGNUM  ||
-         (NPC_REGNUM >= 0 && regno == NPC_REGNUM) ||
-         regno == FP_REGNUM  ||
+         (DEPRECATED_NPC_REGNUM >= 0 && regno == DEPRECATED_NPC_REGNUM) ||
+         regno == DEPRECATED_FP_REGNUM  ||
          regno == SP_REGNUM)
        return;                 /* not a floating point register */
 
@@ -5516,7 +5519,6 @@ mappingflags (long flags)
  * Callback function, does the actual work for 'info proc mappings'.
  */
 
-/* ARGSUSED */
 static int
 info_mappings_callback (struct prmap *map, int (*ignore) (), void *unused)
 {