diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-13 22:17:02 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-13 22:17:02 +0300 |
commit | f2eb56bb7632e4044173a344964d6739a7ef4b7f (patch) | |
tree | 7283397f7bdfb2805f3347b945eaa67d6c7e716f | |
parent | f84bcd99f10ab957af4c84601f9aaaeb43de98b7 (diff) | |
download | mailutils-f2eb56bb7632e4044173a344964d6739a7ef4b7f.tar.gz mailutils-f2eb56bb7632e4044173a344964d6739a7ef4b7f.tar.bz2 |
Minor fixes.
* comsat/comsat.h: Include confpaths.h, not paths.h.
* lib/utmp.c: Likewise.
* libmu_scm/mu_scm.h: Likewise.
* libproto/mailer/sendmail.c: Likewise.
* mail/mail.h: Likewise.
* mailbox/mbx_default.c: Likewise.
* mailbox/version.c: Likewise.
* lib/daemon.c: Likewise.
* include/mailutils/mailer.h (struct timeval): forward decl.
-rw-r--r-- | comsat/comsat.h | 4 | ||||
-rw-r--r-- | include/mailutils/mailer.h | 3 | ||||
-rw-r--r-- | lib/daemon.c | 10 | ||||
-rw-r--r-- | lib/utmp.c | 1 | ||||
-rw-r--r-- | libmu_scm/mu_scm.h | 1 | ||||
-rw-r--r-- | libproto/mailer/sendmail.c | 2 | ||||
-rw-r--r-- | mail/mail.h | 5 | ||||
-rw-r--r-- | mailbox/mbx_default.c | 4 | ||||
-rw-r--r-- | mailbox/version.c | 2 |
9 files changed, 17 insertions, 15 deletions
diff --git a/comsat/comsat.h b/comsat/comsat.h index 5d6d3201e..59937a9a6 100644 --- a/comsat/comsat.h +++ b/comsat/comsat.h @@ -38,9 +38,7 @@ #include <string.h> #include <pwd.h> -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif +#include <confpaths.h> #ifdef HAVE_STRINGS_H # include <strings.h> diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h index 4fb4277d2..7f41c3e36 100644 --- a/include/mailutils/mailer.h +++ b/include/mailutils/mailer.h @@ -38,6 +38,9 @@ extern int mu_mailer_open (mu_mailer_t, int flags); extern int mu_mailer_close (mu_mailer_t); extern int mu_mailer_send_message (mu_mailer_t, mu_message_t, mu_address_t from, mu_address_t to); + +struct timeval; + extern int mu_mailer_send_fragments (mu_mailer_t mailer, mu_message_t msg, size_t fragsize, struct timeval *delay, mu_address_t from, mu_address_t to); diff --git a/lib/daemon.c b/lib/daemon.c index 5bb2ae084..3709f4dcb 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -38,12 +38,10 @@ #include <sys/types.h> #include <sys/wait.h> -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif +#include <confpaths.h> -#ifndef _PATH_DEVNULL -# define _PATH_DEVNULL "/dev/null" +#ifndef PATH_DEVNULL +# define PATH_DEVNULL "/dev/null" #endif /* @@ -180,7 +178,7 @@ waitdaemon (int nochdir, int noclose, int maxwait) for (i = 0; i < fdlimit; i++) close (i); - fd = open (_PATH_DEVNULL, O_RDWR, 0); + fd = open (PATH_DEVNULL, O_RDWR, 0); if (fd != -1) { dup2 (fd, STDIN_FILENO); diff --git a/lib/utmp.c b/lib/utmp.c index f19f50ba5..5e76ea780 100644 --- a/lib/utmp.c +++ b/lib/utmp.c @@ -27,6 +27,7 @@ MA 02110-1301 USA. */ #include <unistd.h> #include <string.h> #include <stdio.h> +#include <confpaths.h> static char *utmp_name = PATH_UTMP; static int fd = -1; diff --git a/libmu_scm/mu_scm.h b/libmu_scm/mu_scm.h index 39e1e2eb6..a7e5caf8d 100644 --- a/libmu_scm/mu_scm.h +++ b/libmu_scm/mu_scm.h @@ -27,6 +27,7 @@ #include <errno.h> #include <sys/time.h> #include <string.h> +#include <confpaths.h> #include <mailutils/mailbox.h> #include <mailutils/message.h> diff --git a/libproto/mailer/sendmail.c b/libproto/mailer/sendmail.c index 40fff122e..beaf24dc9 100644 --- a/libproto/mailer/sendmail.c +++ b/libproto/mailer/sendmail.c @@ -30,6 +30,8 @@ #include <string.h> #include <unistd.h> +#include <confpaths.h> + #include <mailutils/address.h> #include <mailutils/debug.h> #include <mailutils/observer.h> diff --git a/mail/mail.h b/mail/mail.h index 54e4ce199..a600d4697 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -51,9 +51,8 @@ # include <varargs.h> #endif #include <signal.h> -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif + +#include <confpaths.h> #include <xalloc.h> diff --git a/mailbox/mbx_default.c b/mailbox/mbx_default.c index e83435a05..50588f575 100644 --- a/mailbox/mbx_default.c +++ b/mailbox/mbx_default.c @@ -28,9 +28,7 @@ #include <pwd.h> #include <unistd.h> -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif +#include <confpaths.h> #include <mailutils/mailbox.h> #include <mailutils/mutil.h> diff --git a/mailbox/version.c b/mailbox/version.c index 92bd0d7bc..374a2696c 100644 --- a/mailbox/version.c +++ b/mailbox/version.c @@ -26,6 +26,8 @@ #include <stdio.h> #include <string.h> +#include <confpaths.h> + char *mu_license_text = N_(" GNU Mailutils is free software; you can redistribute it and/or modify\n" " it under the terms of the GNU General Public License as published by\n" |