Update.

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

2 files changed, 25 insertions, 25 deletions

diff --git a/login/pty.h b/login/pty.h
index bfd4530730..86d927b600 100644
--- a/login/pty.h
+++ b/login/pty.h
@@ -1,5 +1,5 @@
 /* Functions for pseudo TTY handling.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 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
@@ -31,13 +31,13 @@ __BEGIN_DECLS
 /* Create pseudo tty master slave pair with NAME and set terminal
    attributes according to TERMP and WINP and return handles for both
    ends in AMASTER and ASLAVE.  */
-extern int openpty __P ((int *__amaster, int *__aslave, char *__name,
-			 struct termios *__termp, struct winsize *__winp));
+extern int openpty (int *__amaster, int *__aslave, char *__name,
+		    struct termios *__termp, struct winsize *__winp) __THROW;
 
 /* Create child process and establish the slave pseudo terminal as the
    child's controlling terminal.  */
-extern int forkpty __P ((int *__amaster, char *__name,
-			 struct termios *__termp, struct winsize *__winp));
+extern int forkpty (int *__amaster, char *__name,
+		    struct termios *__termp, struct winsize *__winp) __THROW;
 
 __END_DECLS
 
diff --git a/login/utmp.h b/login/utmp.h
index 21436a33a6..7ae415895d 100644
--- a/login/utmp.h
+++ b/login/utmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 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
@@ -39,56 +39,56 @@ __BEGIN_DECLS
 
 /* Make FD be the controlling terminal, stdin, stdout, and stderr;
    then close FD.  Returns 0 on success, nonzero on error.  */
-extern int login_tty __P ((int __fd));
+extern int login_tty (int __fd) __THROW;
 
 
 /* Write the given entry into utmp and wtmp.  */
-extern void login __P ((__const struct utmp *__entry));
+extern void login (__const struct utmp *__entry) __THROW;
 
 /* Write the utmp entry to say the user on UT_LINE has logged out.  */
-extern int logout __P ((__const char *__ut_line));
+extern int logout (__const char *__ut_line) __THROW;
 
 /* Append to wtmp an entry for the current time and the given info.  */
-extern void logwtmp __P ((__const char *__ut_line, __const char *__ut_name,
-			  __const char *__ut_host));
+extern void logwtmp (__const char *__ut_line, __const char *__ut_name,
+		     __const char *__ut_host) __THROW;
 
 /* Append entry UTMP to the wtmp-like file WTMP_FILE.  */
-extern void updwtmp __P ((__const char *__wtmp_file,
-			  __const struct utmp *__utmp));
+extern void updwtmp (__const char *__wtmp_file, __const struct utmp *__utmp)
+     __THROW;
 
 /* Change name of the utmp file to be examined.  */
-extern int utmpname __P ((__const char *__file));
+extern int utmpname (__const char *__file) __THROW;
 
 /* Read next entry from a utmp-like file.  */
-extern struct utmp *getutent __P ((void));
+extern struct utmp *getutent (void) __THROW;
 
 /* Reset the input stream to the beginning of the file.  */
-extern void setutent __P ((void));
+extern void setutent (void) __THROW;
 
 /* Close the current open file.  */
-extern void endutent __P ((void));
+extern void endutent (void) __THROW;
 
 /* Search forward from the current point in the utmp file until the
    next entry with a ut_type matching ID->ut_type.  */
-extern struct utmp *getutid __P ((__const struct utmp *__id));
+extern struct utmp *getutid (__const struct utmp *__id) __THROW;
 
 /* Search forward from the current point in the utmp file until the
    next entry with a ut_line matching LINE->ut_line.  */
-extern struct utmp *getutline __P ((__const struct utmp *__line));
+extern struct utmp *getutline (__const struct utmp *__line) __THROW;
 
 /* Write out entry pointed to by UTMP_PTR into the utmp file.  */
-extern struct utmp *pututline __P ((__const struct utmp *__utmp_ptr));
+extern struct utmp *pututline (__const struct utmp *__utmp_ptr) __THROW;
 
 
 #ifdef	__USE_MISC
 /* Reentrant versions of the file for handling utmp files.  */
-extern int getutent_r __P ((struct utmp *__buffer, struct utmp **__result));
+extern int getutent_r (struct utmp *__buffer, struct utmp **__result) __THROW;
 
-extern int getutid_r __P ((__const struct utmp *__id, struct utmp *__buffer,
-			   struct utmp **__result));
+extern int getutid_r (__const struct utmp *__id, struct utmp *__buffer,
+		      struct utmp **__result) __THROW;
 
-extern int getutline_r __P ((__const struct utmp *__line,
-			     struct utmp *__buffer, struct utmp **__result));
+extern int getutline_r (__const struct utmp *__line,
+			struct utmp *__buffer, struct utmp **__result) __THROW;
 
 #endif	/* Use misc.  */