Fixes for Cygwin (see ChangeLog)

[citadel.git] / citadel / serv_expire.c

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index c2d34b64cc3076b14d0a84cb7cf41f2c59eb1cb1..e1293d6c44764ba0f85e4ba4f5a5b4a3ba033337 100644 (file)
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -23,6 +23,7 @@
  */
 
 
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -35,7 +36,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include "citadel.h"
 #include "server.h"
 #include <syslog.h>
@@ -95,8 +98,8 @@ extern struct CitContext *ContextList;
 #define MODULE_NAME    "Expire old messages, users, rooms"
 #define MODULE_AUTHOR  "Art Cancro"
 #define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  0
-#define MINOR_VERSION  1
+#define MAJOR_VERSION  1
+#define MINOR_VERSION  0
 
 static struct DLModule_Info info = {
        MODULE_NAME,
@@ -152,7 +155,7 @@ void DoPurgeMessages(struct quickroom *qrbuf) {
                for (a=0; a<(CC->num_msgs); ++a) {
                        delnum = MessageFromList(a);
                        sprintf(msgid, "%ld", delnum);
-                       xtime = output_message(msgid, MT_DATE, 0, 0);
+                       xtime = output_message(msgid, MT_DATE, 0);
 
                        if ((xtime > 0L)
                           && (now - xtime > (time_t)(epbuf.expire_value * 86400L))) {