From 8ed7072052f3c0a4ae7fb94760ca0a22cb827025 Mon Sep 17 00:00:00 2001
From: Theodore Tso <tytso@mit.edu>
Date: Sat, 1 Apr 1995 03:14:56 +0000
Subject: [PATCH] Use configure to see if unistd.h needs to be included. 
 Remove leftover hair from emacs config.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5334 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/movemail/ChangeLog    |  4 ++++
 src/appl/movemail/configure.in |  1 +
 src/appl/movemail/movemail.c   | 20 +++-----------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
index 3f5297787..5f8a8488d 100644
--- a/src/appl/movemail/ChangeLog
+++ b/src/appl/movemail/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 31 21:24:48 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* configure.in, movemail.c: Use configure to see if unistd.h needs
+		to be included.  Remove leftover hair from emacs config.
 
 Mon Mar 27 09:17:06 1995 Chris Provenzano  (proven@mit.edu)
 
diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
index dc56775d4..bfb482c0f 100644
--- a/src/appl/movemail/configure.in
+++ b/src/appl/movemail/configure.in
@@ -6,5 +6,6 @@ KRB_INCLUDE
 WITH_NETLIB
 AC_PROG_INSTALL
 CHECK_FCNTL
+AC_HAVE_HEADERS(unistd.h)
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE
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
-- 
2.26.2