Rev all the header files to sync things with glibc 2.2.4

1 files changed, 47 insertions, 50 deletions

diff --git a/include/sys/wait.h b/include/sys/wait.h
index 2ba604de6..03ac5fe35 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1994,96,97,98,99,2000,2001 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 Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
-   Library General Public License for more details.
+   Lesser 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /*
  *	POSIX Standard: 3.2.1 Wait for Process Termination	<sys/wait.h>
@@ -27,65 +27,64 @@
 
 __BEGIN_DECLS
 
-#include <bits/types.h>
-
-#if defined __USE_XOPEN && !defined pid_t
-typedef __pid_t pid_t;
-# define pid_t pid_t
-#endif
+#include <signal.h>
+#include <sys/resource.h>
 
+/* These macros could also be defined int <stdlib.h>.  */
+#if !defined _STDLIB_H || !defined __USE_XOPEN
 /* This will define the `W*' macros for the flag
    bits to `waitpid', `wait3', and `wait4'.  */
-#include <bits/waitflags.h>
+# include <bits/waitflags.h>
 
-#ifdef	__USE_BSD
+# ifdef	__USE_BSD
 
 /* Lots of hair to allow traditional BSD use of `union wait'
    as well as POSIX.1 use of `int' for the status word.  */
 
-# if defined __GNUC__ && !defined __cplusplus
-#  define __WAIT_INT(status)						      \
+#  if defined __GNUC__ && !defined __cplusplus
+#   define __WAIT_INT(status)						      \
   (__extension__ ({ union { __typeof(status) __in; int __i; } __u;	      \
 		    __u.__in = (status); __u.__i; }))
-# else
-#  define __WAIT_INT(status)	(*(int *) &(status))
-# endif
+#  else
+#   define __WAIT_INT(status)	(*(int *) &(status))
+#  endif
 
 /* This is the type of the argument to `wait'.  The funky union
    causes redeclarations with ether `int *' or `union wait *' to be
    allowed without complaint.  __WAIT_STATUS_DEFN is the type used in
    the actual function definitions.  */
 
-# if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus
-#  define __WAIT_STATUS		__ptr_t
-#  define __WAIT_STATUS_DEFN	__ptr_t
-# else
+#  if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus
+#   define __WAIT_STATUS	void *
+#   define __WAIT_STATUS_DEFN	void *
+#  else
 /* This works in GCC 2.6.1 and later.  */
 typedef union
   {
     union wait *__uptr;
     int *__iptr;
   } __WAIT_STATUS __attribute__ ((__transparent_union__));
-# define __WAIT_STATUS_DEFN	int *
-#endif
+#   define __WAIT_STATUS_DEFN	int *
+#  endif
 
-#else /* Don't use BSD.  */
+# else /* Don't use BSD.  */
 
-# define __WAIT_INT(status)	(status)
-# define __WAIT_STATUS		int *
-# define __WAIT_STATUS_DEFN	int *
+#  define __WAIT_INT(status)	(status)
+#  define __WAIT_STATUS		int *
+#  define __WAIT_STATUS_DEFN	int *
 
-#endif /* Use BSD.  */
+# endif /* Use BSD.  */
 
 /* This will define all the `__W*' macros.  */
-#include <bits/waitstatus.h>
+# include <bits/waitstatus.h>
 
-#define	WEXITSTATUS(status)	__WEXITSTATUS(__WAIT_INT(status))
-#define	WTERMSIG(status)	__WTERMSIG(__WAIT_INT(status))
-#define	WSTOPSIG(status)	__WSTOPSIG(__WAIT_INT(status))
-#define	WIFEXITED(status)	__WIFEXITED(__WAIT_INT(status))
-#define	WIFSIGNALED(status)	__WIFSIGNALED(__WAIT_INT(status))
-#define	WIFSTOPPED(status)	__WIFSTOPPED(__WAIT_INT(status))
+# define WEXITSTATUS(status)	__WEXITSTATUS(__WAIT_INT(status))
+# define WTERMSIG(status)	__WTERMSIG(__WAIT_INT(status))
+# define WSTOPSIG(status)	__WSTOPSIG(__WAIT_INT(status))
+# define WIFEXITED(status)	__WIFEXITED(__WAIT_INT(status))
+# define WIFSIGNALED(status)	__WIFSIGNALED(__WAIT_INT(status))
+# define WIFSTOPPED(status)	__WIFSTOPPED(__WAIT_INT(status))
+#endif	/* <stdlib.h> not included.  */
 
 #ifdef	__USE_BSD
 # define WCOREFLAG		__WCOREFLAG
@@ -107,8 +106,7 @@ typedef enum
 
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.  */
-extern __pid_t __wait __P ((__WAIT_STATUS __stat_loc));
-extern __pid_t wait __P ((__WAIT_STATUS __stat_loc));
+extern __pid_t wait (__WAIT_STATUS __stat_loc) __THROW;
 
 #ifdef	__USE_BSD
 /* Special values for the PID argument to `waitpid' and `wait4'.  */
@@ -128,8 +126,7 @@ extern __pid_t wait __P ((__WAIT_STATUS __stat_loc));
    return PID and store the dead child's status in STAT_LOC.
    Return (pid_t) -1 for errors.  If the WUNTRACED bit is
    set in OPTIONS, return status for stopped children; otherwise don't.  */
-extern __pid_t waitpid __P ((__pid_t __pid, int *__stat_loc,
-			     int __options));
+extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options) __THROW;
 
 #if defined __USE_SVID || defined __USE_XOPEN
 # define __need_siginfo_t
@@ -142,8 +139,8 @@ extern __pid_t waitpid __P ((__pid_t __pid, int *__stat_loc,
    If the WNOHANG bit is set in OPTIONS, and that child
    is not already dead, clear *INFOP and return 0.  If successful, store
    exit code and status in *INFOP.  */
-extern int waitid __P ((idtype_t __idtype, __id_t __id, siginfo_t *__infop,
-			int __options));
+extern int waitid (idtype_t __idtype, __id_t __id, siginfo_t *__infop,
+		   int __options) __THROW;
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -156,8 +153,8 @@ struct rusage;
    nil, store information about the child's resource usage there.  If the
    WUNTRACED bit is set in OPTIONS, return status for stopped children;
    otherwise don't.  */
-extern __pid_t wait3 __P ((__WAIT_STATUS __stat_loc,
-			   int __options, struct rusage * __usage));
+extern __pid_t wait3 (__WAIT_STATUS __stat_loc, int __options,
+		      struct rusage * __usage) __THROW;
 #endif
 
 #ifdef __USE_BSD
@@ -166,8 +163,8 @@ extern __pid_t wait3 __P ((__WAIT_STATUS __stat_loc,
 struct rusage;
 
 /* PID is like waitpid.  Other args are like wait3.  */
-extern __pid_t wait4 __P ((__pid_t __pid, __WAIT_STATUS __stat_loc,
-			   int __options, struct rusage *__usage));
+extern __pid_t wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc, int __options,
+		      struct rusage *__usage) __THROW;
 #endif /* Use BSD.  */