X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpost.c;h=2449d5f5dd58fd9cb50e699df671f6fd9655cfe1;hb=aa703bdada60fae2021d0e97ca3535945eeda615;hp=6429cb4a14cf87b52e582b7cba2f3f67a0cb5979;hpb=f475d48680eb8bb0b6543efab9057eba2773666e;p=mmh

diff --git a/uip/post.c b/uip/post.c
index 6429cb4..2449d5f 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -20,19 +20,12 @@
 #include <h/mts.h>
 
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.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>
 
 #ifdef SMTPMTS
 # include <mts/smtp/smtp.h>
@@ -272,10 +265,10 @@ static char *fccfold[FCCS];	/* foldernames for FCC'ing       */
 
 static struct headers  *hdrtab;	/* table for the message we're doing */
 
-static struct mailname localaddrs={NULL};	/* local addrs     */
-static struct mailname netaddrs={NULL};		/* network addrs   */
-static struct mailname uuaddrs={NULL};		/* uucp addrs      */
-static struct mailname tmpaddrs={NULL};		/* temporary queue */
+static struct mailname localaddrs;		/* local addrs     */
+static struct mailname netaddrs;		/* network addrs   */
+static struct mailname uuaddrs;			/* uucp addrs      */
+static struct mailname tmpaddrs;		/* temporary queue */
 
 #ifdef SMTPMTS
 static int snoop      = 0;
@@ -1614,6 +1607,8 @@ do_text (char *file, int fd)
 static void
 sigser (int i)
 {
+    NMH_UNUSED (i);
+
     unlink (tmpfil);
     if (msgflags & MINV)
 	unlink (bccfil);