Commit 54ea3730 authored by Paul Eggert's avatar Paul Eggert
Browse files

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.
parent bf863853
...@@ -244,17 +244,14 @@ main (int argc, char **argv) ...@@ -244,17 +244,14 @@ main (int argc, char **argv)
#ifndef DISABLE_DIRECT_ACCESS #ifndef DISABLE_DIRECT_ACCESS
char *lockname = 0; char *lockname = 0;
#ifdef MAIL_USE_MAILLOCK
char *spool_name = 0; char *spool_name = 0;
#endif
#ifndef MAIL_USE_SYSTEM_LOCK
#ifdef MAIL_USE_MAILLOCK #ifdef MAIL_USE_MAILLOCK
spool_name = mail_spool_name (inname); spool_name = mail_spool_name (inname);
#endif #endif
if (! spool_name) if (! spool_name)
{ {
#ifndef MAIL_USE_SYSTEM_LOCK
/* Use a lock file named after our first argument with .lock appended: /* Use a lock file named after our first argument with .lock appended:
If it exists, the mail file is locked. */ If it exists, the mail file is locked. */
/* Note: this locking mechanism is *required* by the mailer /* Note: this locking mechanism is *required* by the mailer
...@@ -325,8 +322,8 @@ main (int argc, char **argv) ...@@ -325,8 +322,8 @@ main (int argc, char **argv)
} }
delete_lockname = lockname; delete_lockname = lockname;
}
#endif /* not MAIL_USE_SYSTEM_LOCK */ #endif /* not MAIL_USE_SYSTEM_LOCK */
}
#ifdef SIGCHLD #ifdef SIGCHLD
signal (SIGCHLD, SIG_DFL); signal (SIGCHLD, SIG_DFL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment