From: mistachkin <mistachkin@noemail.net>
Date: Mon, 5 Feb 2018 21:02:47 +0000 (+0000)
Subject: Adjust the previous check-in, which modified the Win32 VFS, so that it works with... 
X-Git-Tag: version-3.23.0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc6b8d73592ad72e674b10152012170a01c31c62;p=thirdparty%2Fsqlite.git

Adjust the previous check-in, which modified the Win32 VFS, so that it works with SQLITE_OMIT_WAL.

FossilOrigin-Name: 36c2e67e82626f8d0a187c6c286c133ed659889e3b577469261b9dcd3b3ab75b
---

diff --git a/manifest b/manifest
index 5469fa43ad..48ba691a5f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allocation\sthe\smutex\sused\sby\sthe\sWin32\sVFS\sonly\sonce\sat\sinitialization,\sinstead\sof\severy\stime\sit\sis\sneeded.
-D 2018-02-05T20:42:50.153
+C Adjust\sthe\sprevious\scheck-in,\swhich\smodified\sthe\sWin32\sVFS,\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_WAL.
+D 2018-02-05T21:02:47.090
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -472,7 +472,7 @@ F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c ce491421b3a54b63094a155eeac668a3bc8e5b86a5a58551d906e5b5affb443f
-F src/os_win.c ca6b6a557b9015d9ecf77003482558b04bbbec86d5065af30e89295dfc01fbb7
+F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c cd194a8793ce061e184ddc369fadbc1020c6f431014d22093f6c5e55c9234033
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
@@ -1704,7 +1704,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5764dc160783f5c4017204b3e26a89d31240c868484ced8214c9ad872bd77bd4
-R 7ec707deb63ac6534c16562af3ea60e2
+P 535ed0ac5e8728ec91fc0a4cb54b820923d161cfd4e0e6aed6df6cdae365bc7d
+R 610345e12e18345d79d861c16dfe01d9
 U mistachkin
-Z 87b212ba57f1d2b4c01281b9a95b7258
+Z 7a54a037e46133481e56c9143fb3122e
diff --git a/manifest.uuid b/manifest.uuid
index 12329d932f..899bc00cb8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-535ed0ac5e8728ec91fc0a4cb54b820923d161cfd4e0e6aed6df6cdae365bc7d
\ No newline at end of file
+36c2e67e82626f8d0a187c6c286c133ed659889e3b577469261b9dcd3b3ab75b
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 6132d321a1..534426977f 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -6063,7 +6063,10 @@ int sqlite3_os_init(void){
   sqlite3_vfs_register(&winLongPathNolockVfs, 0);
 #endif
 
+#ifndef SQLITE_OMIT_WAL
   winBigLock = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_VFS1);
+#endif
+
   return SQLITE_OK;
 }
 
@@ -6074,7 +6077,11 @@ int sqlite3_os_end(void){
     sleepObj = NULL;
   }
 #endif
+
+#ifndef SQLITE_OMIT_WAL
   winBigLock = 0;
+#endif
+
   return SQLITE_OK;
 }