Moved #include of signal.h to h/signals.h. And it was already

in h/nmh.h.

diff --git a/h/signals.h b/h/signals.h
index 6f7ed6c..788fa98 100644 (file)
--- a/h/signals.h
+++ b/h/signals.h
@@ -4,9 +4,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
+#include <signal.h>
+
 /*
  * The type for a signal handler
  */

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 08b7749..3e8f324 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include "smtp.h"
 #include <h/mts.h>
-#include <signal.h>
 #include <h/signals.h>
 
 #ifdef CYRUS_SASL

diff --git a/sbr/getans.c b/sbr/getans.c
index c560905..0800a3c 100644 (file)
--- a/sbr/getans.c
+++ b/sbr/getans.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>
-#include <signal.h>
 
 static char ansbuf[BUFSIZ];
 static sigjmp_buf sigenv;

diff --git a/sbr/getansreadline.c b/sbr/getansreadline.c
index 99c90fe..3282e49 100644 (file)
--- a/sbr/getansreadline.c
+++ b/sbr/getansreadline.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>
-#include <signal.h>
 
 #ifdef READLINE_SUPPORT
 #include <readline/readline.h>

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 079f089..80b93a9 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -32,8 +32,6 @@
 # include <unistd.h>
 #endif
 
-#include <signal.h>
-
 #if defined(HAVE_LIBLOCKFILE)
 #include <lockfile.h>
 #endif

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index a7d9211..a6dc27f 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <signal.h>
 
 int
 pidwait (pid_t id, int sigsok)

diff --git a/sbr/push.c b/sbr/push.c
index ce00f68..b4e3f49 100644 (file)
--- a/sbr/push.c
+++ b/sbr/push.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <signal.h>
 
 
 void

diff --git a/uip/inc.c b/uip/inc.c
index 083a46e..cd98ddb 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,7 +29,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
-
 #include <h/dropsbr.h>
 #include <h/popsbr.h>
 #include <h/fmt_scan.h>
@@ -37,7 +36,6 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include <signal.h>
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 17833f5..91132ce 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 07358cd..8d3a76d 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -19,7 +19,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 36b05b9..0bf725c 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index c839b24..2d2fde1 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -11,7 +11,6 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>
-#include <signal.h>
 #include <fcntl.h>
 #ifdef HAVE_ICONV
 #   include <iconv.h>

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 71540f2..c63cf88 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 8e25c16..fe3d069 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,7 +11,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6e4b193..82e65d7 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -14,7 +14,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <sys/types.h>
 
 /*

diff --git a/uip/mhn.c b/uip/mhn.c
index f0f7fc5..b2db307 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 246d99b..df23047 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -12,7 +12,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 3ff5fd7..5e35cbb 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index d4d767c..f289d47 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 67aaa4d..60c4b83 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 00e0715..ff18533 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 367f51b..4d26b57 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 155ec05..49d2a98 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/msh.c b/uip/msh.c
index 3144a49..2fb2b23 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -26,7 +26,6 @@
 
 #include <pwd.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <h/msh.h>
 #include <h/vmhsbr.h>
 

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index dfa3bbe..f91f277 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -14,7 +14,6 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
 #include <h/utils.h>

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 0116feb..714a8da 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -23,7 +23,6 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
-#include <signal.h>
 
 #define        TRM     "."
 #define        TRMLEN  (sizeof TRM - 1)

diff --git a/uip/post.c b/uip/post.c
index e0bc477..84bc141 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,12 +15,9 @@
 #include <h/dropsbr.h>
 #include <h/mime.h>
 #include <h/utils.h>
-
 #include <h/tws.h>
 #include <h/mts.h>
 
-#include <signal.h>
-
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif

diff --git a/uip/prompter.c b/uip/prompter.c
index 488210d..05f8348 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <signal.h>
 #include <setjmp.h>
 
 #include <termios.h>

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 12d1ab2..2822093 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <signal.h>
 #include <h/mts.h>
 
 #define RCVSTORE_SWITCHES \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 5443748..e9163ba 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -19,7 +19,6 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include <signal.h>
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT

diff --git a/uip/send.c b/uip/send.c
index 58a926d..c5c3f91 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <signal.h>
 
 
 #ifndef CYRUS_SASL

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 10b5f9b..5ca584a 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -10,7 +10,6 @@
 #include <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/tws.h>

diff --git a/uip/slocal.c b/uip/slocal.c
index d1ade5d..11a44cc 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -31,7 +31,6 @@
 #include <h/utils.h>
 
 #include <pwd.h>
-#include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 

diff --git a/uip/viamail.c b/uip/viamail.c
index c6dfb2d..eb3ae8b 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -11,7 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index eb6106a..454d9fc 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -40,7 +40,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <h/mime.h>
 #include <h/utils.h>
 

diff --git a/uip/whom.c b/uip/whom.c
index 862fc58..b81f6f2 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <signal.h>
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)