2 files changed, 14 insertions, 19 deletions
diff --git a/stdio-common/bug3.c b/stdio-common/bug3.c
index 3bb0158a21..6b2ed6b8e0 100644
--- a/stdio-common/bug3.c
+++ b/stdio-common/bug3.c
@@ -1,13 +1,12 @@
-#include <ansidecl.h>
 #include <stdio.h>
 #include <string.h>
 
 int
-DEFUN_VOID(main)
+main (void)
 {
   FILE *f;
   int i;
-  const char filename[] = "/tmp/bugtest";
+  const char filename[] = "/tmp/bug3.test";
 
   f = fopen(filename, "w+");
   for (i=0; i<9000; i++)
diff --git a/stdio-common/bug4.c b/stdio-common/bug4.c
index 492a41d923..a0377862a5 100644
--- a/stdio-common/bug4.c
+++ b/stdio-common/bug4.c
@@ -1,6 +1,3 @@
-#ifdef _LIBC
-#include <ansidecl.h>
-#endif
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -8,13 +5,12 @@
 int stdio_block_read = 1, stdio_block_write = 1;
 
 int
-DEFUN(main, (argc, argv),
-      int argc AND char **argv)
+main (int argc, char *argv[])
 {
   FILE *f;
   int i;
   char buffer[31];
-  const char filename[] = "/tmp/bugtest";
+  const char filename[] = "/tmp/bug4.test";
 
   while ((i = getopt (argc, argv, "rw")) != -1)
     switch (i)
@@ -27,17 +23,17 @@ DEFUN(main, (argc, argv),
 	break;
       }
 
-  f = fopen(filename, "w+");
-  for (i=0; i<9000; i++) {
+  f = fopen (filename, "w+");
+  for (i = 0; i < 9000; ++i)
     putc('x', f);
-  }
-  fseek(f, 8180L, 0);
-  fwrite("Where does this text come from?", 1, 31, f);
-  fseek(f, 8180L, 0);
-  fread(buffer, 1, 31, f);
-  fwrite(buffer, 1, 31, stdout);
-  fclose(f);
-  remove(filename);
+
+  fseek (f, 8180L, 0);
+  fwrite ("Where does this text come from?", 1, 31, f);
+  fseek (f, 8180L, 0);
+  fread (buffer, 1, 31, f);
+  fwrite (buffer, 1, 31, stdout);
+  fclose (f);
+  remove (filename);
 
   if (!memcmp (buffer, "Where does this text come from?", 31))
     {