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 6f7ed6cb0e14cb4046261e662e91604ba7d83e01..788fa98b7197f25f3b913cf6d27a7738a1f3594a 100644 (file)
--- a/h/signals.h
+++ b/h/signals.h
@@ -4,9 +4,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include <config.h>
+# include <config.h>

 #endif
 
 #endif
 

+#include <signal.h>
+

 /*
  * The type for a signal handler
  */
 /*
  * The type for a signal handler
  */

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 08b77498631f93c75671ce06c6a292e72943f7a2..3e8f32465e26ef9610e970baae455ca30f980514 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 <h/mh.h>
 #include "smtp.h"
 #include <h/mts.h>

-#include <signal.h>

 #include <h/signals.h>
 
 #ifdef CYRUS_SASL
 #include <h/signals.h>
 
 #ifdef CYRUS_SASL

diff --git a/sbr/getans.c b/sbr/getans.c
index c5609053c00333ae0fa1662381d31d90770c688e..0800a3c0fea5e9ce0eeb9d5632182466e2d5cc9c 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 <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>

-#include <signal.h>

 
 static char ansbuf[BUFSIZ];
 static sigjmp_buf sigenv;
 
 static char ansbuf[BUFSIZ];
 static sigjmp_buf sigenv;

diff --git a/sbr/getansreadline.c b/sbr/getansreadline.c
index 99c90fec0e15fd7e17bacc6db8c8566af7f10082..3282e499155243b42d9410fd13606f9936c686bb 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 <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>

-#include <signal.h>

 
 #ifdef READLINE_SUPPORT
 #include <readline/readline.h>
 
 #ifdef READLINE_SUPPORT
 #include <readline/readline.h>

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 079f089640788f8ba6556e8c68140ed3941fdf1f..80b93a9035e008a38475dec9b3bb12ee7bf5bf62 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -32,8 +32,6 @@
 # include <unistd.h>
 #endif
 
 # include <unistd.h>
 #endif
 

-#include <signal.h>
-

 #if defined(HAVE_LIBLOCKFILE)
 #include <lockfile.h>
 #endif
 #if defined(HAVE_LIBLOCKFILE)
 #include <lockfile.h>
 #endif

diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index a7d92119e920ba5a6b5f0b71e7a55f933c1ea69e..a6dc27f9c2f4a2bfa2cab21dcf030eceb334bcc1 100644 (file)
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
 
 #include <h/mh.h>
 #include <h/signals.h>

-#include <signal.h>

 
 int
 pidwait (pid_t id, int sigsok)
 
 int
 pidwait (pid_t id, int sigsok)

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

-#include <signal.h>

 
 
 void
 
 
 void

diff --git a/uip/inc.c b/uip/inc.c
index 083a46e6a82968dc6f9b0852a54a167bc97c9ff6..cd98ddb8cb943a444599da544131c833599534a3 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/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>

-

 #include <h/dropsbr.h>
 #include <h/popsbr.h>
 #include <h/fmt_scan.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 <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#include <signal.h>

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 17833f599f8998d422b08111f8d07bdaf48a961d..91132ce3d732fab6ead55e0f52ee359305070655 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 07358cd356b0c6a69119a718253e6207d7d25751..8d3a76dfb17506450a56c7f8cb51becb57cb18b7 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 36b05b9b7ce6bb3c1eabc6ffe9b340a3b5c95080..0bf725c686718fca40882a7bea70662f77a1e0bb 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index c839b2469ab2a3295cb78e3380e2b7c1de78ff30..2d2fde131494cd28d01a322b8d5e6d1762f175ac 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 <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>

-#include <signal.h>

 #include <fcntl.h>
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #include <fcntl.h>
 #ifdef HAVE_ICONV
 #   include <iconv.h>

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 71540f225a16a3ce898165fa5f538d2ada93cb60..c63cf888ce90b5eeaa461c442a4c79dc7fa4ed5d 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 8e25c1645fd3d06bcaacfe8da31fb7abd2d0e54c..fe3d069627036d9df32857879cb7cb3932a2bbb1 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6e4b1934a5ab63fc00985e61c73b302d7a4b2776..82e65d77f26301ee5bca976aba791df49e23017e 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 <h/tws.h>
 #include <h/utils.h>
 #include <setjmp.h>

-#include <signal.h>

 #include <sys/types.h>
 
 /*
 #include <sys/types.h>
 
 /*

diff --git a/uip/mhn.c b/uip/mhn.c
index f0f7fc5356aac5d38163794d11bc6e9fe66d51c3..b2db30705c2ae8a388be65696a382b0d15f064e8 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 246d99b49d16d4b8c28af362d0929dfb3330a710..df23047e6282bc613ca286235c5a7cfc75a01617 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 3ff5fd7ecaf7c3e1fb6f2f09642612283f4cf9cb..5e35cbbf5c77e49881765681d17453a38e766914 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index d4d767c380d42be2c261411500033329dc75fc11..f289d471d18d57dee2bd67e92d12e76c3af0afcd 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 67aaa4d0548abbf95a895ff431e465747bc32fdf..60c4b8376f1f4c0e0d8817b796e222ac2d885420 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 00e0715848fb76eac4014352963d9a0aeee0fdaf..ff18533dbb347d582d9bcafd970bd0717251b049 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 367f51bd15891cc97d414769db34476b6c371fe2..4d26b57344c42fe2cf4361650c57400bb3d43306 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 155ec05633b1d7d4c616dda452057010f6966ebd..49d2a981a08c6c3c6747834f92184eaa83164f4b 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

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

-#include <signal.h>

 #include <h/msh.h>
 #include <h/vmhsbr.h>
 
 #include <h/msh.h>
 #include <h/vmhsbr.h>
 

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index dfa3bbeb623e91273be9ca913a3104fbb329fa2a..f91f277afdabd7a615fa5f22d153325901427180 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 <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>
 #include <h/msh.h>
 #include <h/picksbr.h>
 #include <h/utils.h>

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 0116febba1054ebf288d3788ad7755867672e13d..714a8da785aa883a76916db402e323ceadbf93a1 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -23,7 +23,6 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
 
 #include <h/popsbr.h>
 #include <h/signals.h>

-#include <signal.h>

 
 #define        TRM     "."
 #define        TRMLEN  (sizeof TRM - 1)
 
 #define        TRM     "."
 #define        TRMLEN  (sizeof TRM - 1)

diff --git a/uip/post.c b/uip/post.c
index e0bc4773aea232ba5f1438ad4d7b9273eb8e4434..84bc14188c9358723edc38ebfb9f05d8ff4d337c 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/dropsbr.h>
 #include <h/mime.h>
 #include <h/utils.h>

-

 #include <h/tws.h>
 #include <h/mts.h>
 
 #include <h/tws.h>
 #include <h/mts.h>
 

-#include <signal.h>
-

 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif

diff --git a/uip/prompter.c b/uip/prompter.c
index 488210df48c6a45edbc6700c70183005cb7c3d95..05f8348cfa91f4f2ef2aabb7ff2112c326460364 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 <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>

-#include <signal.h>

 #include <setjmp.h>
 
 #include <termios.h>
 #include <setjmp.h>
 
 #include <termios.h>

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 12d1ab2deefd908f367dffb34862d4c8a168e285..2822093e57f851e1b207f82de24512f7effa0093 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 <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>

-#include <signal.h>

 #include <h/mts.h>
 
 #define RCVSTORE_SWITCHES \
 #include <h/mts.h>
 
 #define RCVSTORE_SWITCHES \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 5443748c99b56674318ad67f5814e3d1630fc181..e9163ba7285c78f5f72b073cdd3edc8a9c45d440 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 <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>

-#include <signal.h>

 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT

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

-#include <signal.h>

 
 
 #ifndef CYRUS_SASL
 
 
 #ifndef CYRUS_SASL

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 10b5f9bd1f99425128b617764e1f5a9bf350f226..5ca584abc8481129a7986db6ac3373ce6047ca81 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 <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>

-#include <signal.h>

 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/tws.h>
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/tws.h>

diff --git a/uip/slocal.c b/uip/slocal.c
index d1ade5db6f74c89bec9d4295be614c7a289030aa..11a44cc952c6e17705e409d72444292c4d565923 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -31,7 +31,6 @@
 #include <h/utils.h>
 
 #include <pwd.h>
 #include <h/utils.h>
 
 #include <pwd.h>

-#include <signal.h>

 #include <sys/ioctl.h>
 #include <fcntl.h>
 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 

diff --git a/uip/viamail.c b/uip/viamail.c
index c6dfb2dc275cf80cc71ea0e11edebea139865087..eb3ae8bc2384c23e48a53b7236f842ca6196e14e 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 <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>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>

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

-#include <signal.h>

 #include <h/mime.h>
 #include <h/utils.h>
 
 #include <h/mime.h>
 #include <h/utils.h>
 

diff --git a/uip/whom.c b/uip/whom.c
index 862fc58c7cd82f927e0355d3b5c229fb754fea8e..b81f6f2083f3f50cfe649fff215bc693de1f79cd 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
 
 #include <h/mh.h>
 #include <h/signals.h>

-#include <signal.h>

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)