diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50fc3e4e9f4..b019f4cec36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,46 @@
 2004-08-15  Mark Kettenis  <kettenis@gnu.org>
 
+	* alphabsd-nat.c (fetch_inferior_registers):
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* amd64bsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* armnbsd-nat.c: Update copyright year.
+	(fetch_register, fetch_regs, fetch_fp_register, fetch_fp_regs)
+	(store_register, store_regs, store_fp_register, store_fp_regs):
+	Replace PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3.
+	* hppabsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* i386bsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers, i386bsd_dr_set, i386bsd_dr_get_status):
+	Replace PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3.
+	* m68kbsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* m88kbsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* mipsnbsd-nat.c: Update copyright year.
+	(fetch_inferior_registers, store_inferior_registers):
+	Replace PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3.
+	* ns32knbsd-nat.c: Update copyright year.
+	(fetch_inferior_registers, store_inferior_registers):
+	Replace PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3.
+	* ppcnbsd-nat.c (fetch_inferior_registers):
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* ppcobsd-nat.c (fetch_inferior_registers):
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	* shnbsd-nat.c: Update copyright year.
+	(fetch_inferior_registers, store_inferior_registers):
+	Replace PTRACE_ARG3_TYPE with PTRACE_TYPE_ARG3.
+	* vaxbsd-nat.c (fetch_inferior_registers)
+	(store_inferior_registers): Replace PTRACE_ARG3_TYPE with
+	PTRACE_TYPE_ARG3.
+	
 	* inferior.h (call_ptrace): Replace PTRACE_ARG3_TYPE with
 	PTRACE_TYPE_ARG3.
 	* infptrace.c (call_ptrace, child_resume, attach, detach)
diff --git a/gdb/alphabsd-nat.c b/gdb/alphabsd-nat.c
index d282a72ad69..4b1dbde3b1f 100644
--- a/gdb/alphabsd-nat.c
+++ b/gdb/alphabsd-nat.c
@@ -91,7 +91,7 @@ fetch_inferior_registers (int regno)
       struct reg gregs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       alphabsd_supply_reg ((char *) &gregs, regno);
@@ -104,7 +104,7 @@ fetch_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       alphabsd_supply_fpreg ((char *) &fpregs, regno);
@@ -121,13 +121,13 @@ store_inferior_registers (int regno)
     {
       struct reg gregs;
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       alphabsd_fill_reg ((char *) &gregs, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &gregs, 0) == -1)
         perror_with_name ("Couldn't write registers");
 
       if (regno != -1)
@@ -139,13 +139,13 @@ store_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       alphabsd_fill_fpreg ((char *) &fpregs, regno);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index 02f4d581321..b30885aa763 100644
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -46,7 +46,7 @@ fetch_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       amd64_supply_native_gregset (current_regcache, &regs, -1);
@@ -59,7 +59,7 @@ fetch_inferior_registers (int regnum)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       amd64_supply_fxsave (current_regcache, -1, &fpregs);
@@ -77,13 +77,13 @@ store_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       amd64_collect_native_gregset (current_regcache, &regs, regnum);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	          (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't write registers");
 
       if (regnum != -1)
@@ -95,13 +95,13 @@ store_inferior_registers (int regnum)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       amd64_collect_fxsave (current_regcache, regnum, &fpregs);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index 13ba0cb8125..2f10ec12528 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -1,5 +1,6 @@
 /* Native-dependent code for BSD Unix running on ARM's, for GDB.
-   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002
+
+   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002, 2004
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -83,7 +84,7 @@ fetch_register (int regno)
   int ret;
 
   ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
     {
@@ -134,7 +135,7 @@ fetch_regs (void)
   int regno;
 
   ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
     {
@@ -152,7 +153,7 @@ fetch_fp_register (int regno)
   int ret;
 
   ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
     {
@@ -182,7 +183,7 @@ fetch_fp_regs (void)
   int regno;
 
   ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
     {
@@ -218,7 +219,7 @@ store_register (int regno)
   int ret;
 
   ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
     {
@@ -280,7 +281,7 @@ store_register (int regno)
     }
 
   ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
     warning ("unable to write register %d to inferior", regno);
@@ -327,7 +328,7 @@ store_regs (void)
     }
 
   ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_registers, 0);
 
   if (ret < 0)
     warning ("unable to store general registers");
@@ -340,7 +341,7 @@ store_fp_register (int regno)
   int ret;
 
   ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
     {
@@ -362,7 +363,7 @@ store_fp_register (int regno)
     }
 
   ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
     warning ("unable to write register %d to inferior", regno);
@@ -384,7 +385,7 @@ store_fp_regs (void)
 			(char *) &inferior_fp_registers.fpr_fpsr);
 
   ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
+		(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
 
   if (ret < 0)
     warning ("unable to store floating-point registers");
diff --git a/gdb/hppabsd-nat.c b/gdb/hppabsd-nat.c
index 1962ded6ffd..fb53c967558 100644
--- a/gdb/hppabsd-nat.c
+++ b/gdb/hppabsd-nat.c
@@ -89,7 +89,7 @@ fetch_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       hppabsd_supply_gregset (regcache, &regs);
@@ -107,13 +107,13 @@ store_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       hppabsd_collect_gregset (current_regcache, &regs, regnum);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	          (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't write registers");
     }
 }
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 3ab4671dc79..f54d2f0fb72 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -136,7 +136,7 @@ fetch_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       i386bsd_supply_gregset (current_regcache, &regs);
@@ -152,7 +152,7 @@ fetch_inferior_registers (int regnum)
 
       if (have_ptrace_xmmregs != 0
 	  && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
-		    (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+		    (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
 	{
 	  have_ptrace_xmmregs = 1;
 	  i387_supply_fxsave (current_regcache, -1, xmmregs);
@@ -160,14 +160,14 @@ fetch_inferior_registers (int regnum)
       else
 	{
           if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		      (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	    perror_with_name ("Couldn't get floating point status");
 
 	  i387_supply_fsave (current_regcache, -1, &fpregs);
 	}
 #else
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       i387_supply_fsave (current_regcache, -1, &fpregs);
@@ -186,13 +186,13 @@ store_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       i386bsd_collect_gregset (current_regcache, &regs, regnum);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	          (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't write registers");
 
       if (regnum != -1)
@@ -207,14 +207,14 @@ store_inferior_registers (int regnum)
 
       if (have_ptrace_xmmregs != 0
 	  && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
-		    (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+		    (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
 	{
 	  have_ptrace_xmmregs = 1;
 
 	  i387_collect_fxsave (current_regcache, regnum, xmmregs);
 
 	  if (ptrace (PT_SETXMMREGS, PIDGET (inferior_ptid),
-		      (PTRACE_ARG3_TYPE) xmmregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
             perror_with_name ("Couldn't write XMM registers");
 	}
       else
@@ -222,13 +222,13 @@ store_inferior_registers (int regnum)
 	  have_ptrace_xmmregs = 0;
 #endif
           if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		      (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	    perror_with_name ("Couldn't get floating point status");
 
           i387_collect_fsave (current_regcache, regnum, &fpregs);
 
           if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		      (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		      (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	    perror_with_name ("Couldn't write floating point status");
 #ifdef HAVE_PT_GETXMMREGS
         }
@@ -253,7 +253,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
   struct dbreg dbregs;
 
   if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
-              (PTRACE_ARG3_TYPE) &dbregs, 0) == -1)
+              (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
     perror_with_name ("Couldn't get debug registers");
 
   /* For some mysterious reason, some of the reserved bits in the
@@ -264,7 +264,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
   DBREG_DRX ((&dbregs), regnum) = value;
 
   if (ptrace (PT_SETDBREGS, PIDGET (inferior_ptid),
-              (PTRACE_ARG3_TYPE) &dbregs, 0) == -1)
+              (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
     perror_with_name ("Couldn't write debug registers");
 }
 
@@ -301,7 +301,7 @@ i386bsd_dr_get_status (void)
      stuff to the target vector.  For now, just return zero if the
      ptrace call fails.  */
   if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) & dbregs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
 #if 0
     perror_with_name ("Couldn't read debug registers");
 #else
diff --git a/gdb/m68kbsd-nat.c b/gdb/m68kbsd-nat.c
index 285c149428d..34e94b4e2f9 100644
--- a/gdb/m68kbsd-nat.c
+++ b/gdb/m68kbsd-nat.c
@@ -114,7 +114,7 @@ fetch_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       m68kbsd_supply_gregset (current_regcache, &regs);
@@ -125,7 +125,7 @@ fetch_inferior_registers (int regnum)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       m68kbsd_supply_fpregset (current_regcache, &fpregs);
@@ -143,13 +143,13 @@ store_inferior_registers (int regnum)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       m68kbsd_collect_gregset (current_regcache, &regs, regnum);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	          (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't write registers");
     }
 
@@ -158,13 +158,13 @@ store_inferior_registers (int regnum)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       m68kbsd_collect_fpregset (current_regcache, &fpregs, regnum);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
diff --git a/gdb/m88kbsd-nat.c b/gdb/m88kbsd-nat.c
index 02ecbdf04f0..7553c19b1ee 100644
--- a/gdb/m88kbsd-nat.c
+++ b/gdb/m88kbsd-nat.c
@@ -68,7 +68,7 @@ fetch_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   m88kbsd_supply_gregset (current_regcache, &regs);
@@ -83,12 +83,12 @@ store_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   m88kbsd_collect_gregset (current_regcache, &regs, regnum);
 
   if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't write registers");
 }
diff --git a/gdb/mipsnbsd-nat.c b/gdb/mipsnbsd-nat.c
index 16521f67617..45fe2bcda65 100644
--- a/gdb/mipsnbsd-nat.c
+++ b/gdb/mipsnbsd-nat.c
@@ -1,5 +1,6 @@
 /* Native-dependent code for MIPS systems running NetBSD.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -43,7 +44,7 @@ fetch_inferior_registers (int regno)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
       
       mipsnbsd_supply_reg ((char *) &regs, regno);
@@ -56,7 +57,7 @@ fetch_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       mipsnbsd_supply_fpreg ((char *) &fpregs, regno);
@@ -71,13 +72,13 @@ store_inferior_registers (int regno)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       mipsnbsd_fill_reg ((char *) &regs, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), 
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't write registers");
 
       if (regno != -1)
@@ -89,13 +90,13 @@ store_inferior_registers (int regno)
       struct fpreg fpregs; 
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get floating point status");
 
       mipsnbsd_fill_fpreg ((char *) &fpregs, regno);
 
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
diff --git a/gdb/ns32knbsd-nat.c b/gdb/ns32knbsd-nat.c
index 52c68405b60..2f66dec4e19 100644
--- a/gdb/ns32knbsd-nat.c
+++ b/gdb/ns32knbsd-nat.c
@@ -1,6 +1,7 @@
 /* Functions specific to running gdb native on an ns32k running NetBSD
-   Copyright 1989, 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+
+   Copyright 1989, 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
+   2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c
index ecc70d2cbb2..7fd84c0423b 100644
--- a/gdb/ppcnbsd-nat.c
+++ b/gdb/ppcnbsd-nat.c
@@ -81,7 +81,7 @@ fetch_inferior_registers (int regno)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       ppcnbsd_supply_reg ((char *) &regs, regno);
@@ -94,7 +94,7 @@ fetch_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get FP registers");
 
       ppcnbsd_supply_fpreg ((char *) &fpregs, regno);
@@ -111,13 +111,13 @@ store_inferior_registers (int regno)
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't get registers");
 
       ppcnbsd_fill_reg ((char *) &regs, regno);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
 	perror_with_name ("Couldn't write registers");
 
       if (regno != -1)
@@ -129,13 +129,13 @@ store_inferior_registers (int regno)
       struct fpreg fpregs;
 
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't get FP registers");
 
       ppcnbsd_fill_fpreg ((char *) &fpregs, regno);
       
       if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-		  (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
 	perror_with_name ("Couldn't set FP registers");
     }
 }
diff --git a/gdb/ppcobsd-nat.c b/gdb/ppcobsd-nat.c
index 713eb4afeba..c36c63f11d8 100644
--- a/gdb/ppcobsd-nat.c
+++ b/gdb/ppcobsd-nat.c
@@ -43,7 +43,7 @@ fetch_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   ppcobsd_supply_gregset (&ppcobsd_gregset, current_regcache, -1,
@@ -59,14 +59,14 @@ store_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   ppcobsd_collect_gregset (&ppcobsd_gregset, current_regcache,
 			   regnum, &regs, sizeof regs);
 
   if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't write registers");
 }
 
diff --git a/gdb/shnbsd-nat.c b/gdb/shnbsd-nat.c
index ec400698553..53a04568f5e 100644
--- a/gdb/shnbsd-nat.c
+++ b/gdb/shnbsd-nat.c
@@ -1,5 +1,6 @@
 /* Native-dependent code for SuperH running NetBSD, for GDB.
-   Copyright 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
diff --git a/gdb/vaxbsd-nat.c b/gdb/vaxbsd-nat.c
index 9f599200439..b00e93db3b5 100644
--- a/gdb/vaxbsd-nat.c
+++ b/gdb/vaxbsd-nat.c
@@ -68,7 +68,7 @@ fetch_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   vaxbsd_supply_gregset (current_regcache, &regs);
@@ -83,13 +83,13 @@ store_inferior_registers (int regnum)
   struct reg regs;
 
   if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't get registers");
 
   vaxbsd_collect_gregset (current_regcache, &regs, regnum);
 
   if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+	      (PTRACE_TYPE_ARG3) &regs, 0) == -1)
     perror_with_name ("Couldn't write registers");
 }