XEmacs 21.2.20 "Yoko".

[chise/xemacs-chise.git] / lib-src / movemail.c

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index fd578c0..9a1a3c6 100644 (file)
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -59,7 +59,6 @@ Boston, MA 02111-1307, USA.  */
 #include <../src/config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/file.h>
 #include <stdio.h>
 #include <errno.h>
 #include "../src/sysfile.h"
@@ -79,7 +78,7 @@ extern char *optarg;
 extern int optind, opterr;
 
 #ifndef HAVE_STRERROR
-static char * strerror (int errnum);
+char * strerror (int errnum);
 #endif /* HAVE_STRERROR */
 
 #ifdef MSDOS
@@ -151,7 +150,8 @@ static char *concat (char *, char *, char *);
 static long *xmalloc (unsigned int);
 #ifdef MAIL_USE_POP
 static int popmail (char *, char *, char *);
-static int pop_retr (popserver server, int msgno, int (*action)(), void *arg);
+static int pop_retr (popserver server, int msgno,
+                    int (*action)(char *, FILE *), void *arg);
 static int mbx_write (char *, FILE *);
 static int mbx_delimit_begin (FILE *);
 static int mbx_delimit_end (FILE *);
@@ -731,7 +731,7 @@ popmail (char *user, char *outfile, char *password)
 }
 
 static int
-pop_retr (popserver server, int msgno, int (*action)(), void *arg)
+pop_retr (popserver server, int msgno, int (*action)(char *, FILE *), void *arg)
 {
   char *line;
   int ret;
@@ -879,7 +879,7 @@ compile_regex (char* pattern)
 #endif /* MAIL_USE_POP */
 \f
 #ifndef HAVE_STRERROR
-static char *
+char *
 strerror (int errnum)
 {
   extern char *sys_errlist[];