4 files changed, 21 insertions, 27 deletions
diff --git a/stdio-common/bug1.c b/stdio-common/bug1.c
index 755bc4231b..455b14d7cf 100644
--- a/stdio-common/bug1.c
+++ b/stdio-common/bug1.c
@@ -1,9 +1,8 @@
-#include <ansidecl.h>
 #include <stdio.h>
 #include <string.h>
 
 int
-DEFUN_VOID(main)
+main (void)
 {
   char *bp;
   size_t size;
diff --git a/stdio-common/bug2.c b/stdio-common/bug2.c
index 2b34c890bf..79b89a4d28 100644
--- a/stdio-common/bug2.c
+++ b/stdio-common/bug2.c
@@ -1,8 +1,7 @@
-#include <ansidecl.h>
 #include <stdio.h>
 
 int
-DEFUN_VOID(main)
+main (void)
 {
   int i;
   puts ("This should print \"wow = I\" for I from 0 to 39 inclusive.");
diff --git a/stdio-common/bug6.c b/stdio-common/bug6.c
index 4a37ab2584..0db63a3b44 100644
--- a/stdio-common/bug6.c
+++ b/stdio-common/bug6.c
@@ -1,8 +1,7 @@
-#include <ansidecl.h>
 #include <stdio.h>
 
 int
-DEFUN_VOID(main)
+main (void)
 {
   char buf[80];
   int i;
diff --git a/stdio-common/fscanf.c b/stdio-common/fscanf.c
index cbe0103368..6b4c75ff30 100644
--- a/stdio-common/fscanf.c
+++ b/stdio-common/fscanf.c
@@ -1,38 +1,35 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1997 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.
+   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
-Library General Public License for more details.
+   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.
 
-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,
-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 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
-#include <ansidecl.h>
 #include <stdarg.h>
 #include <stdio.h>
 
-
 /* Read formatted input from STREAM according to the format string FORMAT.  */
 /* VARARGS2 */
 int
-DEFUN(fscanf, (stream, format),
-      FILE *stream AND CONST char *format DOTS)
+fscanf (FILE *stream, const char *format, ...)
 {
   va_list arg;
   int done;
 
-  va_start(arg, format);
-  done = __vfscanf(stream, format, arg);
-  va_end(arg);
+  va_start (arg, format);
+  done = __vfscanf (stream, format, arg);
+  va_end (arg);
 
   return done;
 }