Update.

	* csu/munch-tmpl.c (__libc_init): Remove K&R support.
	* dirent/scandir64.c: Likewise.
	* pwd/getpw.c: Likewise.
	* stdlib/bsearch.c (bsearch): Likewise.
	* stdlib/tst-strtoll.c: Likewise.
	* localedata/collate-test.c: Likewise.
	* localedata/xfrm-test.c: Likewise.
	* posix/bsd-getpgrp.c: Likewise.
	* sysdeps/alpha/fpu/bits/fenv.h: Likewise.
	* sysdeps/generic/bits/siginfo.h: Likewise.
	* sysdeps/generic/bits/sockaddr.h: Likewise.
	* sysdeps/generic/sys/swap.h: Likewise.
	* sysdeps/generic/sys/sysinfo.h: Likewise.
	* sysdeps/generic/vfork.c: Likewise.
	* sysdeps/m68k/fpu/switch/68881-sw.h: Likewise.
	* sysdeps/mach/hurd/fdopen.c: Likewise.
	* sysdeps/unix/sysv/linux/alpha/sys/acct.h: Likewise.
	* sysdeps/unix/sysv/linux/poll.c: Likewise.
	* sysdeps/unix/sysv/linux/readv.c: Likewise.
	* sysdeps/unix/sysv/linux/writev.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.

	* misc/tst-dirname.c: Remove K&R support, use ANSI C prototypes.
	* shadow/lckpwdf.c: Likewise.
	* stdlib/tst-strtol.c: Likewise.
	* sysdeps/generic/tcsetattr.c: Likewise.
	* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
	* sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.

31 files changed, 122 insertions, 115 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e9e221026..3e4201fe2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,37 @@
 	* sunrpc/rpc_main.c (parseargs): Don't accept -M and -N.
 	Closes PR libc/1731.
 
+	* csu/munch-tmpl.c (__libc_init): Remove K&R support.
+	* dirent/scandir64.c: Likewise.
+	* pwd/getpw.c: Likewise.
+	* stdlib/bsearch.c (bsearch): Likewise.
+	* stdlib/tst-strtoll.c: Likewise.
+	* localedata/collate-test.c: Likewise.
+	* localedata/xfrm-test.c: Likewise.
+	* posix/bsd-getpgrp.c: Likewise.
+	* sysdeps/alpha/fpu/bits/fenv.h: Likewise.
+	* sysdeps/generic/bits/siginfo.h: Likewise.
+	* sysdeps/generic/bits/sockaddr.h: Likewise.
+	* sysdeps/generic/sys/swap.h: Likewise.
+	* sysdeps/generic/sys/sysinfo.h: Likewise.
+	* sysdeps/generic/vfork.c: Likewise.
+	* sysdeps/m68k/fpu/switch/68881-sw.h: Likewise.
+	* sysdeps/mach/hurd/fdopen.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/sys/acct.h: Likewise.
+	* sysdeps/unix/sysv/linux/poll.c: Likewise.
+	* sysdeps/unix/sysv/linux/readv.c: Likewise.
+	* sysdeps/unix/sysv/linux/writev.c: Likewise.
+	* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
+
+	* misc/tst-dirname.c: Remove K&R support, use ANSI C prototypes.
+	* shadow/lckpwdf.c: Likewise.
+	* stdlib/tst-strtol.c: Likewise.
+	* sysdeps/generic/tcsetattr.c: Likewise.
+	* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
+	* sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.
+
 2000-05-22  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf/dl-load.c (_dl_init_paths): If env_path_list has 0 elements,
diff --git a/bits/siginfo.h b/bits/siginfo.h
index e0816a9bc2..31b0dde888 100644
--- a/bits/siginfo.h
+++ b/bits/siginfo.h
@@ -1,5 +1,5 @@
 /* siginfo_t, sigevent and constants.  Stub version.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 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
@@ -185,7 +185,7 @@ typedef struct sigevent
     sigval_t sigev_value;
     int sigev_signo;
     int sigev_notify;
-    void (*sigev_notify_function) __PMT ((sigval_t)); /* Function to start.  */
+    void (*sigev_notify_function) (sigval_t);	    /* Function to start.  */
     void *sigev_notify_attributes;		    /* Really pthread_attr_t.*/
   } sigevent_t;
 
diff --git a/bits/sockaddr.h b/bits/sockaddr.h
index 1c523444ba..91e923ff8e 100644
--- a/bits/sockaddr.h
+++ b/bits/sockaddr.h
@@ -1,5 +1,5 @@
 /* Definition of `struct sockaddr_*' common members.  Generic/4.2 BSD version.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 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,6 +39,6 @@ typedef unsigned short int sa_family_t;
 
 /* Return the length of a `sockaddr' structure.  */
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
-extern int __libc_sa_len __P ((sa_family_t __af));
+extern int __libc_sa_len (sa_family_t __af) __THROW;
 
 #endif	/* bits/sockaddr.h */
diff --git a/csu/munch-tmpl.c b/csu/munch-tmpl.c
index c24eb89787..de8419a737 100644
--- a/csu/munch-tmpl.c
+++ b/csu/munch-tmpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 2000 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
@@ -30,7 +30,7 @@ __libc_init (int argc, char **argv, char **envp)
     {
       /* These functions are defined in crti.o to run the .init and .fini
 	 sections, which are used for initializers and finalizers.  */
-      extern void _init __P ((void)), _fini __P ((void));
+      extern void _init (void), _fini (void);
       atexit (&_fini);		/* Arrange for _fini to run at exit.  */
       _init ();
     }
diff --git a/dirent/scandir64.c b/dirent/scandir64.c
index e158b4045d..1fdff2c64d 100644
--- a/dirent/scandir64.c
+++ b/dirent/scandir64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,97,98,2000 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
@@ -25,8 +25,8 @@ int
 scandir64 (dir, namelist, select, cmp)
      const char *dir;
      struct dirent64 ***namelist;
-     int (*select) __P ((const struct dirent64 *));
-     int (*cmp) __P ((const void *, const void *));
+     int (*select) (const struct dirent64 *);
+     int (*cmp) (const void *, const void *);
 {
   DIR *dp = __opendir (dir);
   struct dirent64 **v = NULL;
diff --git a/localedata/collate-test.c b/localedata/collate-test.c
index 75b234e2cc..789b371ad3 100644
--- a/localedata/collate-test.c
+++ b/localedata/collate-test.c
@@ -1,5 +1,5 @@
 /* Test collation function using real data.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -31,7 +31,7 @@ struct lines
   const char *line;
 };
 
-static int xstrcoll __P ((const void *, const void *));
+static int xstrcoll (const void *, const void *);
 
 int
 main (int argc, char *argv[])
diff --git a/localedata/xfrm-test.c b/localedata/xfrm-test.c
index 0ba288797a..7a9cbf8825 100644
--- a/localedata/xfrm-test.c
+++ b/localedata/xfrm-test.c
@@ -1,5 +1,5 @@
 /* Test collation function via transformation using real data.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -31,7 +31,7 @@ struct lines
   const char *line;
 };
 
-static int xstrcmp __P ((const void *, const void *));
+static int xstrcmp (const void *, const void *);
 
 int
 main (int argc, char *argv[])
diff --git a/misc/tst-dirname.c b/misc/tst-dirname.c
index 3fa38bdfe7..fd24488f4f 100644
--- a/misc/tst-dirname.c
+++ b/misc/tst-dirname.c
@@ -1,5 +1,5 @@
 /* Test program for dirname function a la XPG.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,12 +24,8 @@
 #include <string.h>
 
 
-extern int test __P ((const char *input, const char *result));
-
 int
-test (input, result)
-     const char *input;
-     const char *result;
+test (const char *input, const char *result)
 {
   int retval;
   char *cp;
@@ -42,11 +38,8 @@ test (input, result)
   return retval;
 }
 
-int main __P ((int argc, char *argv[]));
 int
-main (argc, argv)
-     int argc;
-     char *argv[];
+main (void)
 {
   int result = 0;
 
diff --git a/posix/bsd-getpgrp.c b/posix/bsd-getpgrp.c
index e736e9d082..a19695f0e2 100644
--- a/posix/bsd-getpgrp.c
+++ b/posix/bsd-getpgrp.c
@@ -1,5 +1,5 @@
 /* BSD-compatible versions of getpgrp function.
-   Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 94, 95, 96, 97, 2000 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
@@ -21,7 +21,7 @@
 
 /* Don't include unistd.h because it declares a conflicting
    prototype for the POSIX.1 `getpgrp' function.  */
-extern pid_t __getpgid __P ((pid_t));
+extern pid_t __getpgid (pid_t);
 
 pid_t
 __bsd_getpgrp (pid_t pid)
diff --git a/pwd/getpw.c b/pwd/getpw.c
index 5973ef0eea..52224f414e 100644
--- a/pwd/getpw.c
+++ b/pwd/getpw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,96,98,99,2000 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
@@ -27,7 +27,7 @@
    in the given buffer.  This knows the format that the caller
    will expect, but this need not be the format of the password file.  */
 
-int __getpw __P ((__uid_t uid, char *buf));
+int __getpw (__uid_t uid, char *buf);
 
 int
 __getpw (uid, buf)
diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c
index 861e0e0cd2..4f4ff28e54 100644
--- a/shadow/lckpwdf.c
+++ b/shadow/lckpwdf.c
@@ -1,5 +1,5 @@
 /* Handle locking of password file.
-   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -43,7 +43,7 @@ __libc_lock_define_initialized (static, lock)
 
 
 /* Prototypes for local functions.  */
-static void noop_handler __P ((int __sig));
+static void noop_handler (int __sig);
 
 
 /* We cannot simply return in error cases.  We have to close the file
@@ -79,7 +79,7 @@ static void noop_handler __P ((int __sig));
 
 
 int
-__lckpwdf ()
+__lckpwdf (void)
 {
   int flags;
   sigset_t saved_set;			/* Saved set of caught signals.  */
@@ -151,7 +151,7 @@ weak_alias (__lckpwdf, lckpwdf)
 
 
 int
-__ulckpwdf ()
+__ulckpwdf (void)
 {
   int result;
 
@@ -178,8 +178,7 @@ weak_alias (__ulckpwdf, ulckpwdf)
 
 
 static void
-noop_handler (sig)
-     int sig;
+noop_handler (int sig)
 {
   /* We simply return which makes the `fcntl' call return with an error.  */
 }
diff --git a/stdlib/bsearch.c b/stdlib/bsearch.c
index 84af9d655c..bf3aedc03f 100644
--- a/stdlib/bsearch.c
+++ b/stdlib/bsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 2000 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
@@ -23,7 +23,7 @@
    of SIZE bytes each.  The comparisons are done by (*COMPAR)().  */
 void *
 bsearch (const void *key, const void *base, size_t nmemb, size_t size,
-	 int (*compar) __P ((const void *, const void *)))
+	 int (*compar) (const void *, const void *))
 {
   size_t l, u, idx;
   const void *p;
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index c072891ddb..2d5d960986 100644
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -92,10 +92,11 @@ static const struct ltest tests[] =
   {NULL, 0, 0, 0, 0},
   };
 
-static void expand __P ((char *dst, int c));
+/* Prototypes for local functions.  */
+static void expand (char *dst, int c);
 
 int
-main (int argc, char ** argv)
+main (void)
 {
   register const struct ltest *lt;
   char *ep;
diff --git a/stdlib/tst-strtoll.c b/stdlib/tst-strtoll.c
index 38ceaeb0bf..c60f011c67 100644
--- a/stdlib/tst-strtoll.c
+++ b/stdlib/tst-strtoll.c
@@ -80,10 +80,11 @@ static const struct ltest tests[] =
   {NULL, 0, 0, 0, 0},
   };
 
-static void expand __P ((char *dst, int c));
+/* Prototypes for local functions.  */
+static void expand (char *dst, int c);
 
 int
-main (int argc, char ** argv)
+main (void)
 {
   register const struct ltest *lt;
   char *ep;
diff --git a/sysdeps/alpha/fpu/bits/fenv.h b/sysdeps/alpha/fpu/bits/fenv.h
index 8e7b6ece5b..82b85debcd 100644
--- a/sysdeps/alpha/fpu/bits/fenv.h
+++ b/sysdeps/alpha/fpu/bits/fenv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 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
@@ -99,5 +99,5 @@ typedef unsigned long int fenv_t;
 #endif
 
 /* The system calls to talk to the kernel's FP code.  */
-extern unsigned long int __ieee_get_fp_control __P ((void));
-extern void __ieee_set_fp_control __P ((unsigned long int __value));
+extern unsigned long int __ieee_get_fp_control (void) __THROW;
+extern void __ieee_set_fp_control (unsigned long int __value) __THROW;
diff --git a/sysdeps/generic/bits/siginfo.h b/sysdeps/generic/bits/siginfo.h
index e0816a9bc2..31b0dde888 100644
--- a/sysdeps/generic/bits/siginfo.h
+++ b/sysdeps/generic/bits/siginfo.h
@@ -1,5 +1,5 @@
 /* siginfo_t, sigevent and constants.  Stub version.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 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
@@ -185,7 +185,7 @@ typedef struct sigevent
     sigval_t sigev_value;
     int sigev_signo;
     int sigev_notify;
-    void (*sigev_notify_function) __PMT ((sigval_t)); /* Function to start.  */
+    void (*sigev_notify_function) (sigval_t);	    /* Function to start.  */
     void *sigev_notify_attributes;		    /* Really pthread_attr_t.*/
   } sigevent_t;
 
diff --git a/sysdeps/generic/bits/sockaddr.h b/sysdeps/generic/bits/sockaddr.h
index 1c523444ba..91e923ff8e 100644
--- a/sysdeps/generic/bits/sockaddr.h
+++ b/sysdeps/generic/bits/sockaddr.h
@@ -1,5 +1,5 @@
 /* Definition of `struct sockaddr_*' common members.  Generic/4.2 BSD version.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000 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,6 +39,6 @@ typedef unsigned short int sa_family_t;
 
 /* Return the length of a `sockaddr' structure.  */
 #define SA_LEN(_x)	__libc_sa_len((_x)->sa_family)
-extern int __libc_sa_len __P ((sa_family_t __af));
+extern int __libc_sa_len (sa_family_t __af) __THROW;
 
 #endif	/* bits/sockaddr.h */
diff --git a/sysdeps/generic/sys/swap.h b/sysdeps/generic/sys/swap.h
index 207a11cf80..cd4d6d443e 100644
--- a/sysdeps/generic/sys/swap.h
+++ b/sysdeps/generic/sys/swap.h
@@ -1,5 +1,5 @@
 /* Calls to enable and disable swapping on specified locations.  Unix version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000 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
@@ -25,9 +25,9 @@