entered into RCS

2 files changed, 92 insertions, 83 deletions

diff --git a/misc/sys/ptrace.h b/misc/sys/ptrace.h
index b57090e819..22e44e3ae0 100644
--- a/misc/sys/ptrace.h
+++ b/misc/sys/ptrace.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -13,7 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #ifndef	_PTRACE_H
@@ -21,103 +21,105 @@ Cambridge, MA 02139, USA.  */
 #define	_PTRACE_H	1
 #include <features.h>
 
+__BEGIN_DECLS
+
 
 /* Type of the REQUEST argument to `ptrace.'  */
 enum __ptrace_request
-  {
-    /* Indicate that the process making this request should be traced.
-       All signals received by this process can be intercepted by its
-       parent, and its parent can use the other `ptrace' requests.  */
-    PTRACE_TRACEME = 0,
+{
+  /* Indicate that the process making this request should be traced.
+     All signals received by this process can be intercepted by its
+     parent, and its parent can use the other `ptrace' requests.  */
+  PTRACE_TRACEME = 0,
 #define PT_TRACE_ME PTRACE_TRACEME
 
-    /* Return the word in the process's text space at address ADDR.  */
-    PTRACE_PEEKTEXT,
+  /* Return the word in the process's text space at address ADDR.  */
+  PTRACE_PEEKTEXT,
 #define PT_READ_I PTRACE_PEEKTEXT
 
-    /* Return the word in the process's data space at address ADDR.  */
-    PTRACE_PEEKDATA,
+  /* Return the word in the process's data space at address ADDR.  */
+  PTRACE_PEEKDATA,
 #define PT_READ_D PTRACE_PEEKDATA
 
-    /* Return the word in the process's user area at offset ADDR.  */
-    PTRACE_PEEKUSER,
+  /* Return the word in the process's user area at offset ADDR.  */
+  PTRACE_PEEKUSER,
 #define PT_READ_U PTRACE_PEEKUSER
 
-    /* Write the word DATA into the process's text space at address ADDR.  */
-    PTRACE_POKETEXT,
+  /* Write the word DATA into the process's text space at address ADDR.  */
+  PTRACE_POKETEXT,
 #define PT_WRITE_I PTRACE_POKETEXT
 
-    /* Write the word DATA into the process's data space at address ADDR.  */
-    PTRACE_POKEDATA,
+  /* Write the word DATA into the process's data space at address ADDR.  */
+  PTRACE_POKEDATA,
 #define PT_WRITE_D PTRACE_POKEDATA
 
-    /* Write the word DATA into the process's user space at offset ADDR.  */
-    PTRACE_POKEUSER,
+  /* Write the word DATA into the process's user space at offset ADDR.  */
+  PTRACE_POKEUSER,
 #define PT_WRITE_U PTRACE_POKEUSER
 
-    /* Continue the process.  */
-    PTRACE_CONT,
+  /* Continue the process.  */
+  PTRACE_CONT,
 #define PT_CONTINUE PTRACE_CONT
 
-    /* Kill the process.  */
-    PTRACE_KILL,
+  /* Kill the process.  */
+  PTRACE_KILL,
 #define PT_KILL PTRACE_KILL
 
-    /* Single step the process.
-       This is not supported on all machines.  */
-    PTRACE_SINGLESTEP,
+  /* Single step the process.
+     This is not supported on all machines.  */
+  PTRACE_SINGLESTEP,
 #define PT_STEP PTRACE_SINGLESTEP
 
-    /* Attach to a process that is already running. */
-    PTRACE_ATTACH,
+  /* Attach to a process that is already running. */
+  PTRACE_ATTACH,
 #define PT_ATTACH PTRACE_ATTACH
 
-    /* Detach from a process attached to with PTRACE_ATTACH.  */
-    PTRACE_DETACH,
+  /* Detach from a process attached to with PTRACE_ATTACH.  */
+  PTRACE_DETACH,
 #define PT_DETACH PTRACE_DETACH
 
-    /* Get the process's registers (not including floating-point registers)
-       and put them in the `struct regs' (see <machine/regs.h>) at ADDR.  */
-    PTRACE_GETREGS = 12,
+  /* Get the process's registers (not including floating-point registers)
+     and put them in the `struct regs' (see <machine/regs.h>) at ADDR.  */
+  PTRACE_GETREGS = 12,
 
-    /* Set the process's registers (not including floating-point registers)
-       to the contents of the `struct regs' (see <machine/regs.h>) at ADDR.  */
-    PTRACE_SETREGS,
+  /* Set the process's registers (not including floating-point registers)
+     to the contents of the `struct regs' (see <machine/regs.h>) at ADDR.  */
+  PTRACE_SETREGS,
 
-    /* Get the process's floating point registers and put them
-       in the `struct fp_status' (see <machine/regs.h>) at ADDR.  */
-    PTRACE_GETFPGEGS = 14,
+  /* Get the process's floating point registers and put them
+     in the `struct fp_status' (see <machine/regs.h>) at ADDR.  */
+  PTRACE_GETFPREGS = 14,
 
-    /* Set the process's floating point registers to the contents
-       of the `struct fp_status' (see <machine/regs.h>) at ADDR.  */
-    PTRACE_SETFPREGS,
+  /* Set the process's floating point registers to the contents
+     of the `struct fp_status' (see <machine/regs.h>) at ADDR.  */
+  PTRACE_SETFPREGS,
 
-    /* Read DATA bytes from the process's data space at address ADDR.
-       Put the result starting at address ADDR2 in the caller's
-       address space.  */
-    PTRACE_READDATA = 16,
+  /* Read DATA bytes from the process's data space at address ADDR.
+     Put the result starting at address ADDR2 in the caller's
+     address space.  */
+  PTRACE_READDATA = 16,
 
-    /* Write DATA bytes from ADDR2 in the caller's address space into
-       the process's data space at address ADDR.  */
-    PTRACE_WRITEDATA,
+  /* Write DATA bytes from ADDR2 in the caller's address space into
+     the process's data space at address ADDR.  */
+  PTRACE_WRITEDATA,
 
-    /* Read DATA bytes from the process's text space at address ADDR.
-       Put the result starting at address ADDR2 in the caller's
-       address space.  */
-    PTRACE_READTEXT = 18,
+  /* Read DATA bytes from the process's text space at address ADDR.
+     Put the result starting at address ADDR2 in the caller's
+     address space.  */
+  PTRACE_READTEXT = 18,
 
-    /* Write DATA bytes from ADDR2 in the caller's address space into
-       the process's text space at address ADDR.  */
-    PTRACE_WRITETEXT,
+  /* Write DATA bytes from ADDR2 in the caller's address space into
+     the process's text space at address ADDR.  */
+  PTRACE_WRITETEXT,
 
-    /* Read the floating-point accelerator unit registers and
-       put them into the `struct fpa_regs' (see <machine/regs.h>) at ADDR.  */
-    PTRACE_GETFPAREGS = 20,
+  /* Read the floating-point accelerator unit registers and
+     put them into the `struct fpa_regs' (see <machine/regs.h>) at ADDR.  */
+  PTRACE_GETFPAREGS = 20,
 
-    /* Write the floating-point accelerator unit registers from
-       the contents of the `struct fpa_regs' at ADDR.  */       
-    PTRACE_SETFPAREGS,
-  };
+  /* Write the floating-point accelerator unit registers from
+     the contents of the `struct fpa_regs' at ADDR.  */
+  PTRACE_SETFPAREGS,
+};
 
 /* Perform process tracing functions.  REQUEST is one of the values
    above, and determines the action to be taken.
@@ -128,6 +130,8 @@ enum __ptrace_request
    appear (those that are used for the particular request) as:
      pid_t PID, void *ADDR, int DATA, void *ADDR2
    after REQUEST.  */
-extern int EXFUN(ptrace, (enum __ptrace_request __request DOTS));
+extern int ptrace __P ((enum __ptrace_request __request __DOTS));
+
+__END_DECLS
 
-#endif	/* ptrace.h */
+#endif /* ptrace.h */
diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index b47416f030..301712546f 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -1,25 +1,28 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
-The GNU C Library 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 1, or (at your option)
-any later version.
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
 
 The GNU C Library 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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
 
 #ifndef _SYS_UIO_H
 
 #define _SYS_UIO_H	1
 #include <features.h>
 
+__BEGIN_DECLS
+
 #define	__need_size_t
 #include <stddef.h>
 
@@ -27,12 +30,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Structure describing a section of memory.  */
 
 struct iovec
-  {
-    /* Starting address.  */
-    PTR iov_base;
-    /* Length in bytes.  */
-    size_t iov_len;
-  };
+{
+  /* Starting address.  */
+  __ptr_t iov_base;
+  /* Length in bytes.  */
+  size_t iov_len;
+};
 
 
 /* Read data from file descriptor FD, and put the result in the
@@ -40,14 +43,16 @@ struct iovec
    The buffers are filled in the order specified.
    Operates just like `read' (see <unistd.h>) except that data are
    put in VECTOR instead of a contiguous buffer.  */
-int EXFUN(readv, (int __fd, CONST struct iovec *__vector, size_t __count));
+int readv __P ((int __fd, __const struct iovec * __vector, size_t __count));
 
 /* Write data pointed by the buffers described by VECTOR, which
    is a vector of COUNT `struct iovec's, to file descriptor FD.
    The data is written in the order specified.
    Operates just like `write' (see <unistd.h>) except that the data
    are taken from VECTOR instead of a contiguous buffer.  */
-int EXFUN(writev, (int __fd, CONST struct iovec *__vector, size_t __count));
+int writev __P ((int __fd, __const struct iovec * __vector, size_t __count));
+
 
+__END_DECLS
 
 #endif /* sys/uio.h */