Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit f2eb56bb f2eb56bb7632e4044173a344964d6739a7ef4b7f by Sergey Poznyakoff
Options

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
Inline Side-by-side
Showing 9 changed files with 17 additions and 15 deletions
...@@ -38,9 +38,7 @@ ...@@ -38,9 +38,7 @@
38 #include <string.h> 38 #include <string.h>
39 #include <pwd.h> 39 #include <pwd.h>
40 40
41 #ifdef HAVE_PATHS_H 41 #include <confpaths.h>
42 # include <paths.h>
43 #endif
44 42
45 #ifdef HAVE_STRINGS_H 43 #ifdef HAVE_STRINGS_H
46 # include <strings.h> 44 # include <strings.h>
......
...@@ -38,6 +38,9 @@ extern int mu_mailer_open (mu_mailer_t, int flags); ...@@ -38,6 +38,9 @@ extern int mu_mailer_open (mu_mailer_t, int flags);
38 extern int mu_mailer_close (mu_mailer_t); 38 extern int mu_mailer_close (mu_mailer_t);
39 extern int mu_mailer_send_message (mu_mailer_t, mu_message_t, 39 extern int mu_mailer_send_message (mu_mailer_t, mu_message_t,
40 mu_address_t from, mu_address_t to); 40 mu_address_t from, mu_address_t to);
41
42 struct timeval;
43
41 extern int mu_mailer_send_fragments (mu_mailer_t mailer, mu_message_t msg, 44 extern int mu_mailer_send_fragments (mu_mailer_t mailer, mu_message_t msg,
42 size_t fragsize, struct timeval *delay, 45 size_t fragsize, struct timeval *delay,
43 mu_address_t from, mu_address_t to); 46 mu_address_t from, mu_address_t to);
......
...@@ -38,12 +38,10 @@ ...@@ -38,12 +38,10 @@
38 #include <sys/types.h> 38 #include <sys/types.h>
39 #include <sys/wait.h> 39 #include <sys/wait.h>
40 40
41 #ifdef HAVE_PATHS_H 41 #include <confpaths.h>
42 # include <paths.h>
43 #endif
44 42
45 #ifndef _PATH_DEVNULL 43 #ifndef PATH_DEVNULL
46 # define _PATH_DEVNULL "/dev/null" 44 # define PATH_DEVNULL "/dev/null"
47 #endif 45 #endif
48 46
49 /* 47 /*
...@@ -180,7 +178,7 @@ waitdaemon (int nochdir, int noclose, int maxwait) ...@@ -180,7 +178,7 @@ waitdaemon (int nochdir, int noclose, int maxwait)
180 for (i = 0; i < fdlimit; i++) 178 for (i = 0; i < fdlimit; i++)
181 close (i); 179 close (i);
182 180
183 fd = open (_PATH_DEVNULL, O_RDWR, 0); 181 fd = open (PATH_DEVNULL, O_RDWR, 0);
184 if (fd != -1) 182 if (fd != -1)
185 { 183 {
186 dup2 (fd, STDIN_FILENO); 184 dup2 (fd, STDIN_FILENO);
......
...@@ -27,6 +27,7 @@ MA 02110-1301 USA. */ ...@@ -27,6 +27,7 @@ MA 02110-1301 USA. */
27 #include <unistd.h> 27 #include <unistd.h>
28 #include <string.h> 28 #include <string.h>
29 #include <stdio.h> 29 #include <stdio.h>
30 #include <confpaths.h>
30 31
31 static char *utmp_name = PATH_UTMP; 32 static char *utmp_name = PATH_UTMP;
32 static int fd = -1; 33 static int fd = -1;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
27 #include <errno.h> 27 #include <errno.h>
28 #include <sys/time.h> 28 #include <sys/time.h>
29 #include <string.h> 29 #include <string.h>
30 #include <confpaths.h>
30 31
31 #include <mailutils/mailbox.h> 32 #include <mailutils/mailbox.h>
32 #include <mailutils/message.h> 33 #include <mailutils/message.h>
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
30 #include <string.h> 30 #include <string.h>
31 #include <unistd.h> 31 #include <unistd.h>
32 32
33 #include <confpaths.h>
34
33 #include <mailutils/address.h> 35 #include <mailutils/address.h>
34 #include <mailutils/debug.h> 36 #include <mailutils/debug.h>
35 #include <mailutils/observer.h> 37 #include <mailutils/observer.h>
......
...@@ -51,9 +51,8 @@ ...@@ -51,9 +51,8 @@
51 # include <varargs.h> 51 # include <varargs.h>
52 #endif 52 #endif
53 #include <signal.h> 53 #include <signal.h>
54 #ifdef HAVE_PATHS_H 54
55 # include <paths.h> 55 #include <confpaths.h>
56 #endif
57 56
58 #include <xalloc.h> 57 #include <xalloc.h>
59 58
......
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
28 #include <pwd.h> 28 #include <pwd.h>
29 #include <unistd.h> 29 #include <unistd.h>
30 30
31 #ifdef HAVE_PATHS_H 31 #include <confpaths.h>
32 # include <paths.h>
33 #endif
34 32
35 #include <mailutils/mailbox.h> 33 #include <mailutils/mailbox.h>
36 #include <mailutils/mutil.h> 34 #include <mailutils/mutil.h>
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
26 #include <stdio.h> 26 #include <stdio.h>
27 #include <string.h> 27 #include <string.h>
28 28
29 #include <confpaths.h>
30
29 char *mu_license_text = 31 char *mu_license_text =
30 N_(" GNU Mailutils is free software; you can redistribute it and/or modify\n" 32 N_(" GNU Mailutils is free software; you can redistribute it and/or modify\n"
31 " it under the terms of the GNU General Public License as published by\n" 33 " it under the terms of the GNU General Public License as published by\n"
......