aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/movemail.c
diff options
context:
space:
mode:
authorKenichi Handa2010-07-26 13:29:08 +0900
committerKenichi Handa2010-07-26 13:29:08 +0900
commit50efd41b43c9b1b540c49c53d4e7824468ec7879 (patch)
tree4a3be8d0322c537816f47a0c6450fc13495edf35 /lib-src/movemail.c
parentdfe3c90fa5974e200483297e11bb889d0589b8f5 (diff)
parent7d383292d10b876efec43e77fd51c2665e912688 (diff)
downloademacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.tar.gz
emacs-50efd41b43c9b1b540c49c53d4e7824468ec7879.zip
merge trunk
Diffstat (limited to 'lib-src/movemail.c')
-rw-r--r--lib-src/movemail.c6
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 ();
147char *strerror (int); 147char *strerror (int);
148#endif 148#endif
149 149
150static void fatal (char *s1, char *s2, char *s3); 150static void fatal (char *s1, char *s2, char *s3) NO_RETURN;
151static void error (char *s1, char *s2, char *s3); 151static void error (char *s1, char *s2, char *s3);
152static void pfatal_with_name (char *name); 152static void pfatal_with_name (char *name) NO_RETURN;
153static void pfatal_and_delete (char *name); 153static void pfatal_and_delete (char *name) NO_RETURN;
154static char *concat (char *s1, char *s2, char *s3); 154static char *concat (char *s1, char *s2, char *s3);
155static long *xmalloc (unsigned int size); 155static long *xmalloc (unsigned int size);
156#ifdef MAIL_USE_POP 156#ifdef MAIL_USE_POP