Cleaned up gcc warnings when CYRUS_SASL is not enabled.

[mmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 110050d..6215219 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -16,16 +16,10 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 int debugsw = 0;               /* global */
 int forwsw  = 1;
@@ -977,14 +971,14 @@ anno (int fd, struct stat *st)
            sigaddset (&set, SIGINT);
            sigaddset (&set, SIGQUIT);
            sigaddset (&set, SIGTERM);
-           SIGPROCMASK (SIG_BLOCK, &set, &oset);
+           sigprocmask (SIG_BLOCK, &set, &oset);
 
            annoaux (fd);
            if (child_id == OK)
                _exit (0);
 
            /* reset the signal mask */
-           SIGPROCMASK (SIG_SETMASK, &oset, &set);
+           sigprocmask (SIG_SETMASK, &oset, &set);
 
            chdir (cwd);
            break;