diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-09 15:40:49 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-09 15:45:44 -0700 |
| commit | 54ea37308a5f6d7dc803dafaef0030ab5630f68c (patch) | |
| tree | 1370aa378232074edba053c67cf0660e7fd27cbc | |
| parent | bf86385345e37e69d03d65ac3e7ce3fc30d9269d (diff) | |
| download | emacs-54ea37308a5f6d7dc803dafaef0030ab5630f68c.tar.gz emacs-54ea37308a5f6d7dc803dafaef0030ab5630f68c.tar.bz2 emacs-54ea37308a5f6d7dc803dafaef0030ab5630f68c.zip | |
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.
| -rw-r--r-- | lib-src/movemail.c | 7 |
1 files 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); |