Update.

	Patch by khendricks@ivey.uwo.ca [libc/1382].

8 files changed, 107 insertions, 105 deletions

diff --git a/io/fcntl.h b/io/fcntl.h
index aa0796b24d..8706a44dc8 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99 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
@@ -57,42 +57,42 @@ __BEGIN_DECLS
 
 /* Do the file control operation described by CMD on FD.
    The remaining arguments are interpreted depending on CMD.  */
-extern int __fcntl __P ((int __fd, int __cmd, ...));
-extern int fcntl __P ((int __fd, int __cmd, ...));
+extern int __fcntl (int __fd, int __cmd, ...) __THROW;
+extern int fcntl (int __fd, int __cmd, ...) __THROW;
 
 /* Open FILE and return a new file descriptor for it, or -1 on error.
    OFLAG determines the type of access used.  If O_CREAT is on OFLAG,
    the third argument is taken as a `mode_t', the mode of the created file.  */
-extern int __open __P ((__const char *__file, int __oflag, ...));
+extern int __open (__const char *__file, int __oflag, ...) __THROW;
 #ifndef __USE_FILE_OFFSET64
-extern int open __P ((__const char *__file, int __oflag, ...));
+extern int open (__const char *__file, int __oflag, ...) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (open, __P ((__const char *__file, int __oflag, ...)),
+extern int __REDIRECT (open, (__const char *__file, int __oflag, ...) __THROW,
 		       open64);
 # else
 #  define open open64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int open64 __P ((__const char *__file, int __oflag, ...));
+extern int open64 (__const char *__file, int __oflag, ...) __THROW;
 #endif
 
 /* Create and open FILE, with mode MODE.
    This takes an `int' MODE argument because that is
    what `mode_t' will be widened to.  */
 #ifndef __USE_FILE_OFFSET64
-extern int creat __P ((__const char *__file, __mode_t __mode));
+extern int creat (__const char *__file, __mode_t __mode) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (creat, __P ((__const char *__file, __mode_t __mode)),
+extern int __REDIRECT (creat, (__const char *__file, __mode_t __mode) __THROW,
 		       creat64);
 # else
 #  define creat creat64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int creat64 __P ((__const char *__file, __mode_t __mode));
+extern int creat64 (__const char *__file, __mode_t __mode) __THROW;
 #endif
 
 #if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
@@ -111,17 +111,17 @@ extern int creat64 __P ((__const char *__file, __mode_t __mode));
 # define F_TEST  3	/* Test a region for other processes locks.  */
 
 # ifndef __USE_FILE_OFFSET64
-extern int lockf __P ((int __fd, int __cmd, __off_t __len));
+extern int lockf (int __fd, int __cmd, __off_t __len) __THROW;
 # else
 # ifdef __REDIRECT
-extern int __REDIRECT (lockf, __P ((int __fd, int __cmd, __off64_t __len)),
+extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len) __THROW,
 		       lockf64);
 # else
 #  define lockf lockf64
 # endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int lockf64 __P ((int __fd, int __cmd, __off64_t __len));
+extern int lockf64 (int __fd, int __cmd, __off64_t __len) __THROW;
 # endif
 #endif
 
diff --git a/io/fts.h b/io/fts.h
index dc2b4bd4f4..2b500e0e4a 100644
--- a/io/fts.h
+++ b/io/fts.h
@@ -44,7 +44,7 @@ typedef struct {
 	int fts_rfd;			/* fd for root */
 	int fts_pathlen;		/* sizeof(path) */
 	int fts_nitems;			/* elements in the sort array */
-	int (*fts_compar) __PMT((const void *, const void *)); /* compare fn */
+	int (*fts_compar) (const void *, const void *); /* compare fn */
 
 #define	FTS_COMFOLLOW	0x0001		/* follow command line symlinks */
 #define	FTS_LOGICAL	0x0002		/* logical walk */
@@ -113,12 +113,12 @@ typedef struct _ftsent {
 } FTSENT;
 
 __BEGIN_DECLS
-FTSENT	*fts_children __P((FTS *, int));
-int	 fts_close __P((FTS *));
-FTS	*fts_open __P((char * const *, int,
-	    int (*)(const FTSENT **, const FTSENT **)));
-FTSENT	*fts_read __P((FTS *));
-int	 fts_set __P((FTS *, FTSENT *, int));
+FTSENT	*fts_children (FTS *, int) __THROW;
+int	 fts_close (FTS *) __THROW;
+FTS	*fts_open (char * const *, int,
+		   int (*)(const FTSENT **, const FTSENT **)) __THROW;
+FTSENT	*fts_read (FTS *) __THROW;
+int	 fts_set (FTS *, FTSENT *, int) __THROW;
 __END_DECLS
 
 #endif /* fts.h */
diff --git a/io/ftw.h b/io/ftw.h
index 6ccddeea27..2b6f9d9397 100644
--- a/io/ftw.h
+++ b/io/ftw.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1996, 1997, 1998, 1999 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
@@ -86,59 +86,57 @@ struct FTW
 
 
 /* Convenient types for callback functions.  */
-typedef int (*__ftw_func_t) __PMT ((__const char *__filename,
-				    __const struct stat *__status,
-				    int __flag));
+typedef int (*__ftw_func_t) (__const char *__filename,
+			     __const struct stat *__status, int __flag);
 #ifdef __USE_LARGEFILE64
-typedef int (*__ftw64_func_t) __PMT ((__const char *__filename,
-				      __const struct stat64 *__status,
-				      int __flag));
+typedef int (*__ftw64_func_t) (__const char *__filename,
+			       __const struct stat64 *__status, int __flag);
 #endif
 #ifdef __USE_XOPEN_EXTENDED
-typedef int (*__nftw_func_t) __PMT ((__const char *__filename,
-				     __const struct stat *__status, int __flag,
-				     struct FTW *__info));
+typedef int (*__nftw_func_t) (__const char *__filename,
+			      __const struct stat *__status, int __flag,
+			      struct FTW *__info);
 # ifdef __USE_LARGEFILE64
-typedef int (*__nftw64_func_t) __PMT ((__const char *__filename,
-				       __const struct stat64 *__status,
-				       int __flag, struct FTW *__info));
+typedef int (*__nftw64_func_t) (__const char *__filename,
+				__const struct stat64 *__status,
+				int __flag, struct FTW *__info);
 # endif
 #endif
 
 /* Call a function on every element in a directory tree.  */
 #ifndef __USE_FILE_OFFSET64
-extern int ftw __P ((__const char *__dir, __ftw_func_t __func,
-		     int __descriptors));
+extern int ftw (__const char *__dir, __ftw_func_t __func, int __descriptors)
+     __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (ftw, __P ((__const char *__dir, __ftw_func_t __func,
-				  int __descriptors)), ftw64);
+extern int __REDIRECT (ftw, (__const char *__dir, __ftw_func_t __func,
+			     int __descriptors) __THROW, ftw64);
 # else
 #  define ftw ftw64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func,
-		       int __descriptors));
+extern int ftw64 (__const char *__dir, __ftw64_func_t __func,
+		  int __descriptors) __THROW;
 #endif
 
 #ifdef __USE_XOPEN_EXTENDED
 /* Call a function on every element in a directory tree.  FLAG allows
    to specify the behaviour more detailed.  */
 # ifndef __USE_FILE_OFFSET64
-extern int nftw __P ((__const char *__dir, __nftw_func_t __func,
-		      int __descriptors, int __flag));
+extern int nftw (__const char *__dir, __nftw_func_t __func, int __descriptors,
+		 int __flag) __THROW;
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (nftw, __P ((__const char *__dir, __nftw_func_t __func,
-				   int __descriptors, int __flag)), nftw64);
+extern int __REDIRECT (nftw, (__const char *__dir, __nftw_func_t __func,
+			      int __descriptors, int __flag) __THROW, nftw64);
 #  else
 #   define nftw nftw64
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int nftw64 __P ((__const char *__dir, __nftw64_func_t __func,
-			int __descriptors, int __flag));
+extern int nftw64 (__const char *__dir, __nftw64_func_t __func,
+		   int __descriptors, int __flag) __THROW;
 # endif
 #endif
 
diff --git a/io/sys/poll.h b/io/sys/poll.h
index 9cb60e72ea..ac9c634e9d 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -1,5 +1,5 @@
 /* Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1996, 1997, 1998, 1999 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
@@ -41,10 +41,10 @@ struct pollfd
    an event to occur; if TIMEOUT is -1, block until an event occurs.
    Returns the number of file descriptors with events, zero if timed out,
    or -1 for errors.  */
-extern int __poll __P ((struct pollfd *__fds, unsigned long int __nfds,
-			int __timeout));
-extern int poll __P ((struct pollfd *__fds, unsigned long int __nfds,
-		      int __timeout));
+extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
+		   int __timeout) __THROW;
+extern int poll (struct pollfd *__fds, unsigned long int __nfds, int __timeout)
+     __THROW;
 
 __END_DECLS
 
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 97f789715d..d6175dd0cd 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -187,79 +187,81 @@ __BEGIN_DECLS
 
 #ifndef __USE_FILE_OFFSET64
 /* Get file attributes for FILE and put them in BUF.  */
-extern int stat __P ((__const char *__file, struct stat *__buf));
+extern int stat (__const char *__file, struct stat *__buf) __THROW;
 
 /* Get file attributes for the file, device, pipe, or socket
    that file descriptor FD is open on and put them in BUF.  */
-extern int fstat __P ((int __fd, struct stat *__buf));
+extern int fstat (int __fd, struct stat *__buf) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (stat, __P ((__const char *__file, struct stat *__buf)),
+extern int __REDIRECT (stat,
+		       (__const char *__file, struct stat *__buf) __THROW,
 		       stat64);
-extern int __REDIRECT (fstat, __P ((int __fd, struct stat *__buf)), fstat64);
+extern int __REDIRECT (fstat, (int __fd, struct stat *__buf) __THROW, fstat64);
 # else
 #  define stat stat64
 #  define fstat fstat64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int stat64 __P ((__const char *__file, struct stat64 *__buf));
-extern int fstat64 __P ((int __fd, struct stat64 *__buf));
+extern int stat64 (__const char *__file, struct stat64 *__buf) __THROW;
+extern int fstat64 (int __fd, struct stat64 *__buf) __THROW;
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 # ifndef __USE_FILE_OFFSET64
 /* Get file attributes about FILE and put them in BUF.
    If FILE is a symbolic link, do not follow it.  */
-extern int lstat __P ((__const char *__file, struct stat *__buf));
+extern int lstat (__const char *__file, struct stat *__buf) __THROW;
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (lstat, __P ((__const char *__file, struct stat *__buf)),
+extern int __REDIRECT (lstat,
+		       (__const char *__file, struct stat *__buf) __THROW,
 		       lstat64);
 #  else
 #   define lstat lstat64
 #  endif
 # endif
 # ifdef __USE_LARGEFILE64
-extern int lstat64 __P ((__const char *__file, struct stat64 *__buf));
+extern int lstat64 (__const char *__file, struct stat64 *__buf) __THROW;
 # endif
 #endif
 
 /* Set file access permissions for FILE to MODE.
    This takes an `int' MODE argument because that
    is what `mode_t's get widened to.  */
-extern int chmod __P ((__const char *__file, __mode_t __mode));
+extern int chmod (__const char *__file, __mode_t __mode) __THROW;
 
 /* Set file access permissions of the file FD is open on to MODE.  */
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern int fchmod __P ((int __fd, __mode_t __mode));
+extern int fchmod (int __fd, __mode_t __mode) __THROW;
 #endif
 
 
 /* Set the file creation mask of the current process to MASK,
    and return the old creation mask.  */
-extern __mode_t umask __P ((__mode_t __mask));
+extern __mode_t umask (__mode_t __mask) __THROW;
 
 #ifdef	__USE_GNU
 /* Get the current `umask' value without changing it.
    This function is only available under the GNU Hurd.  */
-extern __mode_t getumask __P ((void));
+extern __mode_t getumask (void) __THROW;
 #endif
 
 /* Create a new directory named PATH, with permission bits MODE.  */
-extern int mkdir __P ((__const char *__path, __mode_t __mode));
+extern int mkdir (__const char *__path, __mode_t __mode) __THROW;
 
 /* Create a device file named PATH, with permission and special bits MODE
    and device number DEV (which can be constructed from major and minor
    device numbers with the `makedev' macro above).  */
 #if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern int mknod __P ((__const char *__path,
-		       __mode_t __mode, __dev_t __dev));
+extern int mknod (__const char *__path, __mode_t __mode, __dev_t __dev)
+     __THROW;
 #endif
 
 
 /* Create a new FIFO named PATH, with permission bits MODE.  */
-extern int mkfifo __P ((__const char *__path, __mode_t __mode));
+extern int mkfifo (__const char *__path, __mode_t __mode) __THROW;
 
 /* To allow the `struct stat' structure and the file type `mode_t'
    bits to vary without changing shared library major version number,
@@ -285,20 +287,21 @@ extern int mkfifo __P ((__const char *__path, __mode_t __mode));
 
 /* Wrappers for stat and mknod system calls.  */
 #ifndef __USE_FILE_OFFSET64
-extern int __fxstat __P ((int __ver, int __fildes,
-			  struct stat *__stat_buf));
-extern int __xstat __P ((int __ver, __const char *__filename,
-			 struct stat *__stat_buf));
-extern int __lxstat __P ((int __ver, __const char *__filename,
-			  struct stat *__stat_buf));
+extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf) __THROW;
+extern int __xstat (int __ver, __const char *__filename,
+		    struct stat *__stat_buf) __THROW;
+extern int __lxstat (int __ver, __const char *__filename,
+		     struct stat *__stat_buf) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (__fxstat, __P ((int __ver, int __fildes,
-				       struct stat *__stat_buf)), __fxstat64);
-extern int __REDIRECT (__xstat, __P ((int __ver, __const char *__filename,
-				      struct stat *__stat_buf)), __xstat64);
-extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename,
-				       struct stat *__stat_buf)), __lxstat64);
+extern int __REDIRECT (__fxstat, (int __ver, int __fildes,
+				  struct stat *__stat_buf) __THROW,
+		       __fxstat64);
+extern int __REDIRECT (__xstat, (int __ver, __const char *__filename,
+				 struct stat *__stat_buf) __THROW, __xstat64);
+extern int __REDIRECT (__lxstat, (int __ver, __const char *__filename,
+				  struct stat *__stat_buf) __THROW,
+		       __lxstat64);
 
 # else
 #  define __fxstat __fxstat64
@@ -308,15 +311,15 @@ extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename,
 #endif
 
 #ifdef __USE_LARGEFILE64
-extern int __fxstat64 __P ((int __ver, int __fildes,
-			    struct stat64 *__stat_buf));
-extern int __xstat64 __P ((int __ver, __const char *__filename,
-			   struct stat64 *__stat_buf));
-extern int __lxstat64 __P ((int __ver, __const char *__filename,
-			    struct stat64 *__stat_buf));
+extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf)
+     __THROW;
+extern int __xstat64 (int __ver, __const char *__filename,
+		      struct stat64 *__stat_buf) __THROW;
+extern int __lxstat64 (int __ver, __const char *__filename,
+		       struct stat64 *__stat_buf) __THROW;
 #endif
-extern int __xmknod __P ((int __ver, __const char *__path,
-			  __mode_t __mode, __dev_t *__dev));
+extern int __xmknod (int __ver, __const char *__path, __mode_t __mode,
+		     __dev_t *__dev) __THROW;
 
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Inlined versions of the real stat and mknod functions.  */
diff --git a/io/sys/statfs.h b/io/sys/statfs.h
index be93bc9239..f5258f8d83 100644
--- a/io/sys/statfs.h
+++ b/io/sys/statfs.h
@@ -1,5 +1,5 @@
 /* Definitions for getting information about a filesystem.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999 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
@@ -29,33 +29,34 @@ __BEGIN_DECLS
 
 /* Return information about the filesystem on which FILE resides.  */
 #ifndef __USE_FILE_OFFSET64
-extern int statfs __P ((__const char *__file, struct statfs *__buf));
+extern int statfs (__const char *__file, struct statfs *__buf) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (statfs, __P ((__const char *__file,
-				     struct statfs *__buf)), statfs64);
+extern int __REDIRECT (statfs,
+		       (__const char *__file, struct statfs *__buf) __THROW,
+		       statfs64);
 # else
 #  define statfs statfs64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int statfs64 __P ((__const char *__file, struct statfs64 *__buf));
+extern int statfs64 (__const char *__file, struct statfs64 *__buf) __THROW;
 #endif
 
 /* Return information about the filesystem containing the file FILDES
    refers to.  */
 #ifndef __USE_FILE_OFFSET64
-extern int fstatfs __P ((int __fildes, struct statfs *__buf));
+extern int fstatfs (int __fildes, struct statfs *__buf) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (fstatfs, __P ((int __fildes, struct statfs *__buf)),
+extern int __REDIRECT (fstatfs, (int __fildes, struct statfs *__buf) __THROW,
 		       fstatfs64);
 # else
 #  define fstatfs fstatfs64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int fstatfs64 __P ((int __fildes, struct statfs64 *__buf));
+extern int fstatfs64 (int __fildes, struct statfs64 *__buf) __THROW;
 #endif
 
 __END_DECLS
diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h
index 31d60df28b..6f497cc4a7 100644
--- a/io/sys/statvfs.h
+++ b/io/sys/statvfs.h
@@ -1,5 +1,5 @@
 /* Definitions for getting information about a filesystem.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 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
@@ -29,34 +29,34 @@ __BEGIN_DECLS
 
 /* Return information about the filesystem on which FILE resides.  */
 #ifndef __USE_FILE_OFFSET64
-extern int statvfs __P ((__const char *__file, struct statvfs *__buf));
+extern int statvfs (__const char *__file, struct statvfs *__buf) __THROW;
 #else
 # ifdef __REDIRECT
 extern int __REDIRECT (statvfs,
-		       __P ((__const char *__file, struct statvfs *__buf)),
+		       (__const char *__file, struct statvfs *__buf) __THROW,
 		       statvfs64);
 # else
 #  define statvfs statvfs64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int statvfs64 __P ((__const char *__file, struct statvfs64 *__buf));
+extern int statvfs64 (__const char *__file, struct statvfs64 *__buf) __THROW;
 #endif
 
 /* Return information about the filesystem containing the file FILDES
    refers to.  */
 #ifndef __USE_FILE_OFFSET64
-extern int fstatvfs __P ((int __fildes, struct statvfs *__buf));
+extern int fstatvfs (int __fildes, struct statvfs *__buf) __THROW;
 #else
 # ifdef __REDIRECT
-extern int __REDIRECT (fstatvfs, __P ((int __fildes, struct statvfs *__buf)),
+extern int __REDIRECT (fstatvfs, (int __fildes, struct statvfs *__buf) __THROW,
 		       fstatvfs64);
 # else
 #  define fstatvfs fstatvfs64
 # endif
 #endif
 #ifdef __USE_LARGEFILE64
-extern int fstatvfs64 __P ((int __fildes, struct statvfs64 *__buf));
+extern int fstatvfs64 (int __fildes, struct statvfs64 *__buf) __THROW;
 #endif
 
 __END_DECLS
diff --git a/io/utime.h b/io/utime.h
index bc82bcad7b..d86c14c4ee 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 96, 97, 98, 99 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
@@ -43,8 +43,8 @@ struct utimbuf
 
 /* Set the access and modification times of FILE to those given in
    *FILE_TIMES.  If FILE_TIMES is NULL, set them to the current time.  */
-extern int utime __P ((__const char *__file,
-		       __const struct utimbuf *__file_times));
+extern int utime (__const char *__file,
+		  __const struct utimbuf *__file_times) __THROW;
 
 __END_DECLS