Mercurial > hg > xemacs-beta
diff lib-src/movemail.c @ 163:0132846995bd r20-3b8
Import from CVS: tag r20-3b8
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:43:35 +0200 |
parents | 6b37e6ddd302 |
children | 8eaf7971accc |
line wrap: on
line diff
--- a/lib-src/movemail.c Mon Aug 13 09:42:28 2007 +0200 +++ b/lib-src/movemail.c Mon Aug 13 09:43:35 2007 +0200 @@ -62,6 +62,7 @@ #include <stdio.h> #include <errno.h> #include "../src/syswait.h" +#include "../src/systime.h" #include <stdlib.h> #include <string.h> #ifdef MAIL_USE_POP @@ -92,20 +93,19 @@ #define DISABLE_DIRECT_ACCESS #endif /* WINDOWSNT */ -#ifdef USG -#include <fcntl.h> +#if defined (HAVE_UNISTD_H) || defined (USG) #include <unistd.h> +#endif /* unistd.h */ #ifndef F_OK #define F_OK 0 #define X_OK 1 #define W_OK 2 #define R_OK 4 -#endif -#endif /* USG */ +#endif /* No F_OK */ -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#if defined (HAVE_FCNTL_H) || defined (USG) +#include <fcntl.h> +#endif /* fcntl.h */ #if defined (XENIX) || defined (WINDOWSNT) #include <sys/locking.h> @@ -493,15 +493,6 @@ #include <stdio.h> #include <pwd.h> -#ifdef USG -#include <fcntl.h> -/* Cancel substitutions made by config.h for Emacs. */ -#undef open -#undef read -#undef write -#undef close -#endif /* USG */ - #define NOTOK (-1) #define OK 0 #define DONE 1