diff options
| author | Stefan Monnier | 2010-08-11 07:42:48 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-08-11 07:42:48 +0200 |
| commit | c566235d981eba73c88bbff00b6a1d88360b6e9f (patch) | |
| tree | f8d653add3570fe750a83d1123ed35022e0bf4ef /lib-src/movemail.c | |
| parent | 0bfdb86f425a88fe43ebc88851c6f9a6418e1862 (diff) | |
| parent | 490b89acab3e759426ede25c31c94268df55e925 (diff) | |
| download | emacs-c566235d981eba73c88bbff00b6a1d88360b6e9f.tar.gz emacs-c566235d981eba73c88bbff00b6a1d88360b6e9f.zip | |
Merge from trunk
Diffstat (limited to 'lib-src/movemail.c')
| -rw-r--r-- | lib-src/movemail.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 541edf545df..bb4a922014c 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -147,10 +147,10 @@ static char *mail_spool_name (); | |||
| 147 | char *strerror (int); | 147 | char *strerror (int); |
| 148 | #endif | 148 | #endif |
| 149 | 149 | ||
| 150 | static void fatal (char *s1, char *s2, char *s3); | 150 | static void fatal (char *s1, char *s2, char *s3) NO_RETURN; |
| 151 | static void error (char *s1, char *s2, char *s3); | 151 | static void error (char *s1, char *s2, char *s3); |
| 152 | static void pfatal_with_name (char *name); | 152 | static void pfatal_with_name (char *name) NO_RETURN; |
| 153 | static void pfatal_and_delete (char *name); | 153 | static void pfatal_and_delete (char *name) NO_RETURN; |
| 154 | static char *concat (char *s1, char *s2, char *s3); | 154 | static char *concat (char *s1, char *s2, char *s3); |
| 155 | static long *xmalloc (unsigned int size); | 155 | static long *xmalloc (unsigned int size); |
| 156 | #ifdef MAIL_USE_POP | 156 | #ifdef MAIL_USE_POP |