3 files changed, 11 insertions, 9 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e80ca8a4cc2..8afa8e2b54b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* fakemail.c (action): Convert function definitions to standard C.
+	(add_a_stream):
+	* test-distrib.c (cool_read):
+	(main): Likewise.
+
 2010-07-03  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sorted-doc.c (cmpdoc): Fix signature.
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index ec5abb71aeb..f4d978b7d11 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -100,7 +100,7 @@ typedef struct header_record *header;
 struct stream_record
 {
   FILE *handle;
-  int (*action)();
+  int (*action)(FILE *);
   struct stream_record *rest_streams;
 };
 typedef struct stream_record *stream_list;
@@ -417,7 +417,7 @@ close_the_streams (void)
 }
 
 void
-add_a_stream (FILE *the_stream, int (*closing_action) (/* ??? */))
+add_a_stream (FILE *the_stream, int (*closing_action) (FILE *))
 {
   stream_list old = the_streams;
   the_streams = new_stream ();
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index a6c7c187f8a..880bd115882 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -52,10 +52,7 @@ char buf[300];
 
 /* Like `read' but keeps trying until it gets SIZE bytes or reaches eof.  */
 int
-cool_read (fd, buf, size)
-     int fd;
-     char *buf;
-     int size;
+cool_read (int fd, char *buf, int size)
 {
   int num, sofar = 0;
 
@@ -70,9 +67,7 @@ cool_read (fd, buf, size)
 }
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int fd;