This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

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

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 12f180a..6fa783e 100644 (file)
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -150,7 +150,7 @@ 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)(char *, FILE *), void *arg);
+                    int (*action)(char *, FILE *), FILE *arg);
 static int mbx_write (char *, FILE *);
 static int mbx_delimit_begin (FILE *);
 static int mbx_delimit_end (FILE *);
@@ -204,7 +204,9 @@ struct option longopts[] =
 #define DEFAULT_LOCKING DOTLOCKING
 #endif
 
+#ifndef DISABLE_DIRECT_ACCESS
 static void lock_dot(char *);
+#endif
 static void unlock_dot(char *);
 static int parse_lock_method(char *);
 static char *unparse_lock_method(int);
@@ -566,6 +568,7 @@ dot_filename(char *filename)
 
 static char *dotlock_filename = NULL;
 
+#ifndef DISABLE_DIRECT_ACCESS
 static void
 lock_dot(char *filename)
 {
@@ -625,6 +628,7 @@ lock_dot(char *filename)
     }
   strcpy(dotlock_filename, filename);
 }
+#endif /* not DISABLE_DIRECT_ACCESS */
 
 static void
 unlock_dot(char *filename)
@@ -771,7 +775,7 @@ popmail (char *user, char *outfile, char *password)
       return (1);
     }
 #if !defined(__CYGWIN32__) && !defined(WINDOWSNT)
-  fchown (mbfi, getuid (), -1);
+  fchown (mbfi, getuid (), (gid_t) -1);
 #endif
 
   if ((mbf = fdopen (mbfi, "wb")) == NULL)
@@ -863,7 +867,7 @@ popmail (char *user, char *outfile, char *password)
 }
 
 static int
-pop_retr (popserver server, int msgno, int (*action)(char *, FILE *), void *arg)
+pop_retr (popserver server, int msgno, int (*action)(char *, FILE *), FILE *arg)
 {
   char *line;
   int ret;