Commit f2eb56bb f2eb56bb7632e4044173a344964d6739a7ef4b7f by Sergey Poznyakoff

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.
1 parent f84bcd99
......@@ -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>
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......