Index: dovecot/src/lib/test-event-filter.c
===================================================================
--- dovecot.orig/src/lib/test-event-filter.c
+++ dovecot/src/lib/test-event-filter.c
@@ -1003,32 +1003,32 @@ static void test_event_filter_interval_v
 		{ "field > 1mins", 60 * 1000 * 1000, FALSE },
 		{ "field < 1mins", 60 * 1000 * 1000, FALSE },
 
-		{ "field = 1hours", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field = 1h", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field = 3600000000", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field >= 1hours", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field <= 1hours", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field > 1mins", 60L * 60 * 1000 * 1000, TRUE },
-		{ "field > 1hours", 60L * 60 * 1000 * 1000, FALSE },
-		{ "field < 1hours", 60L * 60 * 1000 * 1000, FALSE },
+		{ "field = 1hours", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field = 1h", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field = 3600000000", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field >= 1hours", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field <= 1hours", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field > 1mins", 60LL * 60 * 1000 * 1000, TRUE },
+		{ "field > 1hours", 60LL * 60 * 1000 * 1000, FALSE },
+		{ "field < 1hours", 60LL * 60 * 1000 * 1000, FALSE },
 
-		{ "field = 1days", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field = 1d", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field = 86400000000", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field >= 1days", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field <= 1days", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field > 1hours", 24L * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field > 1days", 24L * 60 * 60 * 1000 * 1000, FALSE },
-		{ "field < 1days", 24L * 60 * 60 * 1000 * 1000, FALSE },
+		{ "field = 1days", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field = 1d", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field = 86400000000", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field >= 1days", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field <= 1days", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field > 1hours", 24LL * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field > 1days", 24LL * 60 * 60 * 1000 * 1000, FALSE },
+		{ "field < 1days", 24LL * 60 * 60 * 1000 * 1000, FALSE },
 
-		{ "field = 1weeks", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field = 1w", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field = 604800000000", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field >= 1weeks", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field <= 1weeks", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field > 1days", 7L * 24 * 60 * 60 * 1000 * 1000, TRUE },
-		{ "field > 1weeks", 7L * 24 * 60 * 60 * 1000 * 1000, FALSE },
-		{ "field < 1weeks", 7L * 24 * 60 * 60 * 1000 * 1000, FALSE },
+		{ "field = 1weeks", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field = 1w", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field = 604800000000", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field >= 1weeks", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field <= 1weeks", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field > 1days", 7LL * 24 * 60 * 60 * 1000 * 1000, TRUE },
+		{ "field > 1weeks", 7LL * 24 * 60 * 60 * 1000 * 1000, FALSE },
+		{ "field < 1weeks", 7LL * 24 * 60 * 60 * 1000 * 1000, FALSE },
 	};
 
 	struct event_filter *filter;