2007-08-10 [wwp] 2.10.0cvs112

	* src/msgcache.c
		Disable mmap reads in Windows only (at least temporarily), they
		prevent from renaming/removing target cache files.

diff --git a/ChangeLog b/ChangeLog
index f0ea4207d71f58fb5f3e113f744c69f598525cd0..fbc092e4db996552756b5f8c16098fa8777ddd6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-10 [wwp]       2.10.0cvs112
+
+       * src/msgcache.c
+               Disable mmap reads in Windows only (at least temporarily), they
+               prevent from renaming/removing target cache files.
+
 2007-08-10 [paul]
 
        3.0.0-rc2 released

diff --git a/PATCHSETS b/PATCHSETS
index 6cac12503f50414ee78fc599223a4e527386c00e..ba7c00c6a8ef5dddf24c70212a518117fd2c884f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2765,3 +2765,4 @@
 ( cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/editldap.c;  cvs diff -u -r 1.213.2.154 -r 1.213.2.155 src/folder.c;  ) > 2.10.0cvs109.patchset
 ( cvs diff -u -r 1.179.2.180 -r 1.179.2.181 src/imap.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/etpan-thread-manager-types.h;  cvs diff -u -r 1.1.4.81 -r 1.1.4.82 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/etpan/imap-thread.h;  ) > 2.10.0cvs110.patchset
 ( cvs diff -u -r 1.16.2.55 -r 1.16.2.56 src/msgcache.c;  cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/recv.c;  ) > 2.10.0cvs111.patchset
+( cvs diff -u -r 1.16.2.56 -r 1.16.2.57 src/msgcache.c;  ) > 2.10.0cvs112.patchset

diff --git a/configure.ac b/configure.ac
index 9e035d091ee43e69d923d05d4b4dca46359b1cc5..24611ef08849c6bc3f2c2d18c6f4d78104e43c67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=111
+EXTRA_VERSION=112
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/msgcache.c b/src/msgcache.c
index 200bfabed86faffaa05727e82466c0aa3525ed30..5313f6d6ed87b4a2d28cf7cb87e01365e8ad6681 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -69,7 +69,11 @@
         ((x[2]&0xff) << 16) |          \
         ((x[3]&0xff) << 24))
 
+#ifdef G_OS_WIN32
+static gboolean msgcache_use_mmap_read = FALSE;
+#else
 static gboolean msgcache_use_mmap_read = TRUE;
+#endif
 static gboolean msgcache_use_mmap_write = FALSE;
 
 #else
@@ -87,7 +91,11 @@ static gboolean msgcache_use_mmap_write = FALSE;
         ((x[2]&0xff) << 16) |          \
         ((x[3]&0xff) << 24))
 
+#ifdef G_OS_WIN32
+static gboolean msgcache_use_mmap_read = FALSE;
+#else
 static gboolean msgcache_use_mmap_read = TRUE;
+#endif
 static gboolean msgcache_use_mmap_write = FALSE;
 #endif