From: David Levine <levinedl@acm.org>
Date: Sun, 14 Apr 2013 15:47:31 +0000 (-0500)
Subject: Moved #include of signal.h to h/signals.h.  And it was already
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/55f65ae2d3baf60396d3359db952460939de03ca?ds=sidebyside;hp=61ccf1dbeea93978803303d2cd43efa5da2cc7d1

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 6f7ed6cb..788fa98b 100644
--- 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 08b77498..3e8f3246 100644
--- 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 c5609053..0800a3c0 100644
--- 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 99c90fec..3282e499 100644
--- 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 079f0896..80b93a90 100644
--- 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 a7d92119..a6dc27f9 100644
--- 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 ce00f68d..b4e3f498 100644
--- 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 083a46e6..cd98ddb8 100644
--- 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 17833f59..91132ce3 100644
--- 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 07358cd3..8d3a76df 100644
--- 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 36b05b9b..0bf725c6 100644
--- 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 c839b246..2d2fde13 100644
--- 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 71540f22..c63cf888 100644
--- 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 8e25c164..fe3d0696 100644
--- 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 6e4b1934..82e65d77 100644
--- 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 f0f7fc53..b2db3070 100644
--- 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 246d99b4..df23047e 100644
--- 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 3ff5fd7e..5e35cbbf 100644
--- 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 d4d767c3..f289d471 100644
--- 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 67aaa4d0..60c4b837 100644
--- 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 00e07158..ff18533d 100644
--- 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 367f51bd..4d26b573 100644
--- 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 155ec056..49d2a981 100644
--- 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 3144a493..2fb2b230 100644
--- 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 dfa3bbeb..f91f277a 100644
--- 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 0116febb..714a8da7 100644
--- 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 e0bc4773..84bc1418 100644
--- 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 488210df..05f8348c 100644
--- 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 12d1ab2d..2822093e 100644
--- 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 5443748c..e9163ba7 100644
--- 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 58a926d5..c5c3f91a 100644
--- 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 10b5f9bd..5ca584ab 100644
--- 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 d1ade5db..11a44cc9 100644
--- 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 c6dfb2dc..eb3ae8bc 100644
--- 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 eb6106a7..454d9fca 100644
--- 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 862fc58c..b81f6f20 100644
--- 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)