2 files changed, 8 insertions, 15 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b85ba12a5b2..a74d4b90b9f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume POSIX 1003.1-1988 or later for errno.h (Bug#12968).
+        * movemail.c (main): Assume EAGAIN and EBUSY.
+
 2012-11-23  Paul Eggert  <eggert@cs.ucla.edu>
 
         movemail: treat EACCES etc. failures as permanent
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 264b3d292c6..f2b2484c8e3 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -430,22 +430,10 @@ main (int argc, char **argv)
          for certain failure codes.  */
       if (status < 0)
         {
-          if (++lockcount <= 5)
+          if (++lockcount <= 5 && (errno == EAGAIN || errno == EBUSY))
             {
-#ifdef EAGAIN
-              if (errno == EAGAIN)
-                {
-                  sleep (1);
-                  goto retry_lock;
-                }
-#endif
-#ifdef EBUSY
-              if (errno == EBUSY)
-                {
-                  sleep (1);
-                  goto retry_lock;
-                }
-#endif
+              sleep (1);
+              goto retry_lock;
             }
 
           pfatal_with_name (inname);