From 2e0a5ae090ce3951448a8e883dd88c8af9a1247e Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 6 Apr 1998 10:17:33 +0000
Subject: [PATCH] Move cancelations up.  Include <stdlib.h> if available.

---
 lib-src/movemail.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 8d23fc7b8fd..7e29ab4150f 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -91,6 +91,12 @@ Boston, MA 02111-1307, USA.  */
 #define DISABLE_DIRECT_ACCESS
 #endif /* WINDOWSNT */
 
+/* Cancel substitutions made by config.h for Emacs.  */
+#undef open
+#undef read
+#undef write
+#undef close
+
 #ifdef USG
 #include <fcntl.h>
 #include <unistd.h>
@@ -106,6 +112,10 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 #endif
 
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#endif
+
 #if defined (XENIX) || defined (WINDOWSNT)
 #include <sys/locking.h>
 #endif
@@ -133,12 +143,6 @@ static char *mail_spool_name ();
 #endif
 #endif
 
-/* Cancel substitutions made by config.h for Emacs.  */
-#undef open
-#undef read
-#undef write
-#undef close
-
 #ifndef errno
 extern int errno;
 #endif
-- 
2.39.2