entered into RCS

2 files changed, 71 insertions, 62 deletions

diff --git a/resource/sys/vlimit.h b/resource/sys/vlimit.h
index ceb377fd66..db0fdaeac5 100644
--- a/resource/sys/vlimit.h
+++ b/resource/sys/vlimit.h
@@ -1,55 +1,58 @@
-/* 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_VLIMIT_H
 
 #define _SYS_VLIMIT_H	1
 #include <features.h>
 
+__BEGIN_DECLS
+
 /* This interface is obsolete, and is superseded by <sys/resource.h>.  */
 
 /* Kinds of resource limit.  */
 enum __vlimit_resource
-  {
-    /* Setting this non-zero makes it impossible to raise limits.
-       Only the super-use can set it to zero.
+{
+  /* Setting this non-zero makes it impossible to raise limits.
+     Only the super-use can set it to zero.
 
-       This is not implemented in recent versions of BSD, nor by
-       the GNU C library.  */
-    LIM_NORAISE,
+     This is not implemented in recent versions of BSD, nor by
+     the GNU C library.  */
+  LIM_NORAISE,
 
-    /* CPU time available for each process (seconds).  */
-    LIM_CPU,
+  /* CPU time available for each process (seconds).  */
+  LIM_CPU,
 
-    /* Largest file which can be created (bytes).  */
-    LIM_FSIZE,
+  /* Largest file which can be created (bytes).  */
+  LIM_FSIZE,
 
-    /* Maximum size of the data segment (bytes).  */
-    LIM_DATA,
+  /* Maximum size of the data segment (bytes).  */
+  LIM_DATA,
 
-    /* Maximum size of the stack segment (bytes).  */
-    LIM_STACK,
+  /* Maximum size of the stack segment (bytes).  */
+  LIM_STACK,
 
-    /* Largest core file that will be created (bytes).  */
-    LIM_CORE,
+  /* Largest core file that will be created (bytes).  */
+  LIM_CORE,
 
-    /* Resident set size (bytes).  */
-    LIM_MAXRSS
-  };
+  /* Resident set size (bytes).  */
+  LIM_MAXRSS
+};
 
 /* This means no limit.  */
 #define INFINITY 0x7fffffff
@@ -57,7 +60,9 @@ enum __vlimit_resource
 
 /* Set the soft limit for RESOURCE to be VALUE.
    Returns 0 for success, -1 for failure.  */
-int EXFUN(vlimit, (enum __vlimit_resource __resource, int __value));
+int vlimit __P ((enum __vlimit_resource __resource, int __value));
+
 
+__END_DECLS
 
 #endif /* vlimit.h  */
diff --git a/resource/sys/vtimes.h b/resource/sys/vtimes.h
index dd600d15c1..e83d34c101 100644
--- a/resource/sys/vtimes.h
+++ b/resource/sys/vtimes.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 _SYS_VTIMES_H
@@ -21,6 +21,8 @@ Cambridge, MA 02139, USA.  */
 #define _SYS_VTIMES_H	1
 #include <features.h>
 
+__BEGIN_DECLS
+
 /* This interface is obsolete; use `getrusage' instead.  */
 
 /* Granularity of the `vm_utime' and `vm_stime' fields of a `struct vtimes'.
@@ -28,38 +30,40 @@ Cambridge, MA 02139, USA.  */
 #define	VTIMES_UNITS_PER_SECOND	60
 
 struct vtimes
-  {
-    /* User time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
-    int vm_utime;
-    /* System time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
-    int vm_stime;
-
-    /* Amount of data and stack memory used (kilobyte-seconds).  */
-    unsigned int vm_idsrss;
-    /* Amount of text memory used (kilobyte-seconds).  */
-    unsigned int vm_ixrss;
-    /* Maximum resident set size (text, data, and stack) (kilobytes).  */
-    int vm_maxrss;
-
-    /* Number of hard page faults (i.e. those that required I/O).  */
-    int vm_majflt;
-    /* Number of soft page faults (i.e. those serviced by reclaiming
-       a page from the list of pages awaiting reallocation.  */
-    int vm_minflt;
-
-    /* Number of times a process was swapped out of physical memory.  */
-    int vm_nswap;
-
-    /* Number of input operations via the file system.  Note: This
-       and `ru_outblock' do not include operations with the cache.  */
-    int vm_inblk;
-    /* Number of output operations via the file system.  */
-    int vm_outblk;
-  };
+{
+  /* User time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
+  int vm_utime;
+  /* System time used in units of 1/VTIMES_UNITS_PER_SECOND seconds.  */
+  int vm_stime;
+
+  /* Amount of data and stack memory used (kilobyte-seconds).  */
+  unsigned int vm_idsrss;
+  /* Amount of text memory used (kilobyte-seconds).  */
+  unsigned int vm_ixrss;
+  /* Maximum resident set size (text, data, and stack) (kilobytes).  */
+  int vm_maxrss;
+
+  /* Number of hard page faults (i.e. those that required I/O).  */
+  int vm_majflt;
+  /* Number of soft page faults (i.e. those serviced by reclaiming
+     a page from the list of pages awaiting reallocation.  */
+  int vm_minflt;
+
+  /* Number of times a process was swapped out of physical memory.  */
+  int vm_nswap;
+
+  /* Number of input operations via the file system.  Note: This
+     and `ru_oublock' do not include operations with the cache.  */
+  int vm_inblk;
+  /* Number of output operations via the file system.  */
+  int vm_oublk;
+};
 
 /* If CURRENT is not NULL, write statistics for the current process into
    *CURRENT.  If CHILD is not NULL, write statistics for all terminated child
    processes into *CHILD.  Returns 0 for success, -1 for failure.  */
-int EXFUN(vtimes, (struct vtimes *__current, struct vtimes *__child));
+int vtimes __P ((struct vtimes * __current, struct vtimes * __child));
+
+__END_DECLS
 
-#endif	/* sys/vtimes.h  */
+#endif /* sys/vtimes.h  */