From: mistachkin <mistachkin@noemail.net>
Date: Thu, 16 May 2013 12:41:49 +0000 (+0000)
Subject: Fix compilation with SQLITE_OMIT_WAL on Win32.
X-Git-Tag: version-3.7.17~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e8752d487edb879855877afd86ae64d2dd149be;p=thirdparty%2Fsqlite.git

Fix compilation with SQLITE_OMIT_WAL on Win32.

FossilOrigin-Name: 6d45a79fb18dcd305cc41c525060e42f2402bd77
---

diff --git a/manifest b/manifest
index f3e24afc9e..8b5c104d53 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\ssqlite3_close_v2(),\sdo\snot\sattempt\sto\sroll\sback\sa\stransaction\sif\sthere\sexist\sactive\sstatement\sobjects.\sAny\sopen\stransaction\swill\sbe\srolled\sback\swhen\sthe\slast\sof\sthese\sstatement\sobjects\sis\sfinalized.
-D 2013-05-16T11:57:28.062
+C Fix\scompilation\swith\sSQLITE_OMIT_WAL\son\sWin32.
+D 2013-05-16T12:41:49.183
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 101fc5d712bfa348313987e5728ead013dc82fba
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 5e0b0ca7594f6707a3ed155528a3ba3318c95e15
-F src/os_win.c 4e2bf0760409aef35e298ff725054e94d834e1a3
+F src/os_win.c 2076d4d1f0f2f06c622b6617b4959910a5dc5b4e
 F src/pager.c 49e23f9898113ddfe90942bdf1c1ef57955d0921
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 9708365594eea519cdc8504dee425c0a41c79502
@@ -1065,7 +1065,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 9ffff3d05226bbd01a0745dd0a511776358253c0
-R 1a17d95315a3a4d605dc90092cbaec4e
-U dan
-Z 6e4c531756ef5b922f59a9b9e491858b
+P d11e76072a17fe833b87595d9d79f2c4b0b09cb3
+R 3da03a8d3e4a56c326130da7065a196f
+U mistachkin
+Z 80f7b643846aae133072aa5f02717db7
diff --git a/manifest.uuid b/manifest.uuid
index 99b6ba1500..8c24432491 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d11e76072a17fe833b87595d9d79f2c4b0b09cb3
\ No newline at end of file
+6d45a79fb18dcd305cc41c525060e42f2402bd77
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 66f0703878..fe47207d5c 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2937,8 +2937,6 @@ static int winDeviceCharacteristics(sqlite3_file *id){
          ((p->ctrlFlags & WINFILE_PSOW)?SQLITE_IOCAP_POWERSAFE_OVERWRITE:0);
 }
 
-#ifndef SQLITE_OMIT_WAL
-
 /* 
 ** Windows will only let you create file view mappings
 ** on allocation size granularity boundaries.
@@ -2947,6 +2945,8 @@ static int winDeviceCharacteristics(sqlite3_file *id){
 */
 SYSTEM_INFO winSysInfo;
 
+#ifndef SQLITE_OMIT_WAL
+
 /*
 ** Helper functions to obtain and relinquish the global mutex. The
 ** global mutex is used to protect the winLockInfo objects used by