fix issues preventing compilationjannis

1 files changed, 8 insertions, 7 deletions

diff --git a/src/qmail-send.c b/src/qmail-send.c
index 31aa60e..13800f4 100644
--- a/src/qmail-send.c
+++ b/src/qmail-send.c
@@ -40,8 +40,8 @@
 #include "sendtodo.h"
 #include "trigger.h"
 
-int lifetime = 604800;
-int bouncemaxbytes = 0;
+long lifetime = 604800;
+long bouncemaxbytes = 0;
 
 stralloc percenthack = {0};
 struct constmap mappercenthack;
@@ -444,14 +444,15 @@ void pqfinish()
 {
   int c;
   struct prioq_elt pe;
-  time_t ut[2]; /* XXX: more portable than utimbuf, but still worrisome */
+  //time_t ut[2]; /* XXX: more portable than utimbuf, but still worrisome */
+  struct utimbuf ut;
 
   for (c = 0; c < CHANNELS; ++c) {
     while (prioq_min(&pqchan[c], &pe)) {
       prioq_delmin(&pqchan[c]);
       fnmake_chanaddr(pe.id, c);
-      ut[0] = ut[1] = pe.dt;
-      if (utime(fn.s, ut) == -1)
+      ut.actime = ut.modtime = pe.dt;
+      if (utime(fn.s, &ut) == -1)
         log3s("warning: unable to utime ", fn.s, "; message will be retried too soon\n");
     }
   }
@@ -796,8 +797,8 @@ struct del {
 };
 
 unsigned long masterdelid = 1;
-unsigned int concurrency[CHANNELS] = {10, 20};
-unsigned int concurrencyused[CHANNELS] = {0, 0};
+unsigned long concurrency[CHANNELS] = {10, 20};
+unsigned long concurrencyused[CHANNELS] = {0, 0};
 struct del *d[CHANNELS];
 stralloc dline[CHANNELS];
 char delbuf[2048];