diff options
| author | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /lib-src/movemail.c | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lib-src/movemail.c')
| -rw-r--r-- | lib-src/movemail.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 231bc22fa89..84c8ce24286 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" @@ -246,13 +244,14 @@ main (int argc, char **argv) #ifndef DISABLE_DIRECT_ACCESS char *lockname = 0; + char *spool_name = 0; -#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 @@ -323,8 +322,8 @@ main (int argc, char **argv) } delete_lockname = lockname; - } #endif /* not MAIL_USE_SYSTEM_LOCK */ + } #ifdef SIGCHLD signal (SIGCHLD, SIG_DFL); |