1 files changed, 2 insertions, 12 deletions

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index cd329a110a8..264b3d292c6 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -96,13 +96,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #endif /* WINDOWSNT */
 
-#ifndef F_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif
-
 #ifdef WINDOWSNT
 #include <sys/locking.h>
 #endif
@@ -335,11 +328,8 @@ main (int argc, char **argv)
 
           tem = link (tempname, lockname);
 
-#ifdef EPERM
-          if (tem < 0 && errno == EPERM)
-            fatal ("Unable to create hard link between %s and %s",
-                   tempname, lockname);
-#endif
+          if (tem < 0 && errno != EEXIST)
+            pfatal_with_name (lockname);
 
           unlink (tempname);
           if (tem >= 0)