diff options
| author | Bastien | 2017-07-03 09:06:29 +0200 |
|---|---|---|
| committer | Bastien | 2017-07-03 09:06:29 +0200 |
| commit | 5ca1888fe670aee7febd4d42665d7372ab2ffebc (patch) | |
| tree | 1f7f8d8a7580e556fc83cf3a6aaeec567b33a090 /lib-src/movemail.c | |
| parent | 20e006ffee41062f1b551a92c24d9edc53cd0f56 (diff) | |
| parent | 1b4f0a92ff3505ef9a465b9b391756e3a73a6443 (diff) | |
| download | emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.tar.gz emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.zip | |
Merge branch 'master' into scratch/org-mode-merge
Diffstat (limited to 'lib-src/movemail.c')
| -rw-r--r-- | lib-src/movemail.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index cd12c48ed36..e5ca0b16611 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -59,7 +59,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 59 | #include <sys/types.h> | 59 | #include <sys/types.h> |
| 60 | #include <sys/stat.h> | 60 | #include <sys/stat.h> |
| 61 | #include <sys/file.h> | 61 | #include <sys/file.h> |
| 62 | #include <stdio.h> | ||
| 63 | #include <stdlib.h> | 62 | #include <stdlib.h> |
| 64 | #include <errno.h> | 63 | #include <errno.h> |
| 65 | #include <time.h> | 64 | #include <time.h> |
| @@ -69,6 +68,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 69 | #include <fcntl.h> | 68 | #include <fcntl.h> |
| 70 | #include <signal.h> | 69 | #include <signal.h> |
| 71 | #include <string.h> | 70 | #include <string.h> |
| 71 | |||
| 72 | #include <unlocked-io.h> | ||
| 73 | |||
| 72 | #include "syswait.h" | 74 | #include "syswait.h" |
| 73 | #ifdef MAIL_USE_POP | 75 | #ifdef MAIL_USE_POP |
| 74 | #include "pop.h" | 76 | #include "pop.h" |