summaryrefslogtreecommitdiffstats
path: root/src/appl/movemail/movemail.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/appl/movemail/movemail.c')
-rw-r--r--src/appl/movemail/movemail.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c
index 6f31220a5..6798899bf 100644
--- a/src/appl/movemail/movemail.c
+++ b/src/appl/movemail/movemail.c
@@ -68,16 +68,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "krb5.h"
#endif
#endif
-#ifdef USG
+
#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifndef F_OK
#define F_OK 0
#define X_OK 1
#define W_OK 2
#define R_OK 4
#endif
-#endif /* USG */
#ifdef XENIX
#include <sys/locking.h>
@@ -104,12 +105,6 @@ extern char *getenv();
#include <strings.h>
#endif
-/* Cancel substitutions made by config.h for Emacs. */
-#undef open
-#undef read
-#undef write
-#undef close
-
char *concat ();
extern int errno;
@@ -382,15 +377,6 @@ xmalloc (size)
#include <hesiod.h>
#endif
-#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