From 54ea37308a5f6d7dc803dafaef0030ab5630f68c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Sep 2015 15:40:49 -0700
Subject: [PATCH] Refix movemail GCC pacification

Problem reported by Ken Brown in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00406.html
* lib-src/movemail.c (main): Fix previous change.
---
 lib-src/movemail.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index c25db625387..84c8ce24286 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -244,17 +244,14 @@ main (int argc, char **argv)
 #ifndef DISABLE_DIRECT_ACCESS
 
   char *lockname = 0;
-
-#ifdef MAIL_USE_MAILLOCK
   char *spool_name = 0;
-#endif
 
-#ifndef MAIL_USE_SYSTEM_LOCK
 #ifdef MAIL_USE_MAILLOCK
   spool_name = mail_spool_name (inname);
 #endif
   if (! spool_name)
     {
+#ifndef MAIL_USE_SYSTEM_LOCK
       /* Use a lock file named after our first argument with .lock appended:
 	 If it exists, the mail file is locked.  */
       /* Note: this locking mechanism is *required* by the mailer
@@ -325,8 +322,8 @@ main (int argc, char **argv)
 	}
 
       delete_lockname = lockname;
-    }
 #endif /* not MAIL_USE_SYSTEM_LOCK */
+    }
 
 #ifdef SIGCHLD
   signal (SIGCHLD, SIG_DFL);
-- 
2.11.4.GIT