From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Sep 2015 10:36:08 +0000 (-0700)
Subject: Port movemail to RHEL 6 with --enable-gcc-warnings
X-Git-Tag: emacs-25.0.90~1224^2~184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6c8cb57fc23f46d431ffc372abff9d8b2ed486c;p=emacs.git

Port movemail to RHEL 6 with --enable-gcc-warnings

* lib-src/movemail.c (main): Declare local only if needed.
---

diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 231bc22fa89..c25db625387 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -174,8 +174,6 @@ main (int argc, char **argv)
   int desc;
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 
-  char *spool_name = 0;
-
 #ifdef MAIL_USE_POP
   bool pop_reverse_order = false;
 # define ARGSTR "pr"
@@ -247,6 +245,10 @@ main (int argc, char **argv)
 
   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);