X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsendsbr.c;h=04d6ea92245cdfd7a5563101ee0dc2f10d44aa15;hb=8a87f7b5fd5622dcde0fc4b48d93157616b496f0;hp=110050d821b2e1f8d6f7f96df3a6584bebb10212;hpb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;p=mmh

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 110050d..04d6ea9 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -9,23 +9,17 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <setjmp.h>
+#include <h/m_setjmp.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <h/mime.h>
 #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;
@@ -116,7 +110,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
     }
 
     done=armed_done;
-    switch (setjmp (env)) {
+    switch (m_setjmp (env)) {
     case OK: 
 	/*
 	 * If given -push and -unique (which is undocumented), then
@@ -675,7 +669,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
     time (&clock);
     snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
-		(int) getpid(), (long) clock, LocalName());
+		(int) getpid(), (long) clock, LocalName(1));
 
     fseek (in, start, SEEK_SET);
     for (partno = 1; partno <= nparts; partno++) {
@@ -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;