X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Finboxrules%2Fserv_inboxrules.c;h=204b7cbc69b436c7ca5d574bbf0d5a2c41d4fb29;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=2852e00bfdf056f40e39b6b749cc1f24fe37c0da;hpb=4f81523e181d1a3e57615cf411d48abe2ab45d1c;p=citadel.git

diff --git a/citadel/modules/inboxrules/serv_inboxrules.c b/citadel/modules/inboxrules/serv_inboxrules.c
index 2852e00bf..204b7cbc6 100644
--- a/citadel/modules/inboxrules/serv_inboxrules.c
+++ b/citadel/modules/inboxrules/serv_inboxrules.c
@@ -21,18 +21,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -837,11 +826,13 @@ int num_urip_alloc = 0;
  * Perform inbox processing for all rooms which require it
  */
 void perform_inbox_processing(void) {
+	int i = 0;
+
 	if (num_urip == 0) {
 		return;											// no action required
 	}
 
-	for (int i=0; i<num_urip; ++i) {
+	for (i=0; i<num_urip; ++i) {
 		do_inbox_processing_for_user(users_requiring_inbox_processing[i]);
 	}
 
@@ -857,6 +848,7 @@ void perform_inbox_processing(void) {
  * If it's someone's inbox, we have to check for inbox rules
  */
 int serv_inboxrules_roomhook(struct ctdlroom *room) {
+	int i = 0;
 
 	// Is this someone's inbox?
 	if (!strcasecmp(&room->QRname[11], MAILROOM)) {
@@ -865,7 +857,7 @@ int serv_inboxrules_roomhook(struct ctdlroom *room) {
 
 			// first check to see if this user is already on the list
 			if (num_urip > 0) {
-				for (int i=0; i<=num_urip; ++i) {
+				for (i=0; i<=num_urip; ++i) {
 					if (users_requiring_inbox_processing[i] == usernum) {		// already on the list!
 						return(0);
 					}