X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=7f8d39a73d64c1069391cb653f69980f159197ae;hb=6bd5e1baa07e971d42188391a12f330b82174c48;hp=73babadf4e530e960491dc8af757a0dbf6566172;hpb=27826f9353e0f0b04590b7d0f8f83e60462b90f0;p=mmh

diff --git a/uip/pick.c b/uip/pick.c
index 73babad..7f8d39a 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -10,16 +10,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>
 
 static struct swit switches[] = {
 #define ANDSW  0
@@ -87,7 +81,8 @@ static void putzero_done(int) NORETURN;
 int
 main(int argc, char **argv)
 {
-	int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0;
+	int publicsw = -1, zerosw = 1, vecp = 0;
+	unsigned int seqp = 0;
 	int lo, hi, msgnum;
 	char *maildir, *folder = NULL, buf[100];
 	char *cp, **argp, **arguments;
@@ -834,7 +829,7 @@ PRaction(struct nexus *n, int level)
 	if (n->n_action == TWSaction) {
 		fprintf(stderr, "TEMPORAL(%s) %s: %s\n",
 				n->n_after ? "after" : "before", n->n_datef,
-				dasctime(&n->n_tws, TW_NULL));
+				dasctime(&n->n_tws));
 		return;
 	}
 	fprintf(stderr, "UNKNOWN(0x%x)\n",