Maildir: Uidlist stale timeout macro is now globally available.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index 1a70a9962429f0818fd87d354a41f4313c1ef72c..53af5bfa7731834528dbfdf81634de77408c760f 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -46,9 +46,6 @@
    error occurs in the middle of reading it */
 #define UIDLIST_ESTALE_RETRY_COUNT NFS_ESTALE_RETRY_COUNT
 
-/* how many seconds to wait before overriding uidlist.lock */
-#define UIDLIST_LOCK_STALE_TIMEOUT (60*2)
-
 #define UIDLIST_VERSION 3
 #define UIDLIST_COMPRESS_PERCENTAGE 75
 
@@ -242,8 +239,10 @@ maildir_uidlist_init_readonly(struct index_mailbox *ibox)
        uidlist->dotlock_settings.nfs_flush =
                (box->storage->flags &
                 MAIL_STORAGE_FLAG_NFS_FLUSH_STORAGE) != 0;
-       uidlist->dotlock_settings.timeout = UIDLIST_LOCK_STALE_TIMEOUT + 2;
-       uidlist->dotlock_settings.stale_timeout = UIDLIST_LOCK_STALE_TIMEOUT;
+       uidlist->dotlock_settings.timeout =
+               MAILDIR_UIDLIST_LOCK_STALE_TIMEOUT + 2;
+       uidlist->dotlock_settings.stale_timeout =
+               MAILDIR_UIDLIST_LOCK_STALE_TIMEOUT;
 
        return uidlist;
 }

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.h b/src/lib-storage/index/maildir/maildir-uidlist.h
index f9c96ec4753e92a045517aea14c271cfd44bd004..d78e833b2b8ef48cbad9292677505005e62dd9bd 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-uidlist.h
+++ b/src/lib-storage/index/maildir/maildir-uidlist.h
@@ -2,7 +2,10 @@
 #define MAILDIR_UIDLIST_H
 
 #define MAILDIR_UIDLIST_NAME "dovecot-uidlist"
+/* how many seconds to wait before overriding uidlist.lock */
+#define MAILDIR_UIDLIST_LOCK_STALE_TIMEOUT (60*2)
 
+struct index_mailbox;
 struct maildir_mailbox;
 struct maildir_uidlist;
 struct maildir_uidlist_sync_ctx;