From: mistachkin <mistachkin@noemail.net>
Date: Fri, 17 Aug 2012 11:47:32 +0000 (+0000)
Subject: Skip defining some WAL specific things in the Win32 VFS code when compiling without... 
X-Git-Tag: version-3.7.14~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f92833f9d9cbee92223623c820b1db90ec96947;p=thirdparty%2Fsqlite.git

Skip defining some WAL specific things in the Win32 VFS code when compiling without WAL support.  Also, fix an example command line in the MSVC makefile.

FossilOrigin-Name: 61b1ae121782525b37882a559d0fbb7c85237fd5
---

diff --git a/Makefile.msc b/Makefile.msc
index a7daea756d..3948050cb6 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -76,7 +76,7 @@ LD = link.exe
 # For example, to use the x86 compiler when cross-compiling for x64, a command
 # line similar to the following could be used (all on one line):
 #
-#     nmake /f Makefile.msc
+#     nmake /f Makefile.msc sqlite3.dll
 #           "NCC=""%VCINSTALLDIR%\bin\cl.exe"""
 #           USE_NATIVE_LIBPATHS=1
 #
diff --git a/manifest b/manifest
index ed0976d6a5..981c410f2f 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Changes\sto\sthe\sspellfix\stest\sscript\sto\smake\sthe\sresults\sdeterministic.
-D 2012-08-15T16:43:07.389
+C Skip\sdefining\ssome\sWAL\sspecific\sthings\sin\sthe\sWin32\sVFS\scode\swhen\scompiling\swithout\sWAL\ssupport.\s\sAlso,\sfix\san\sexample\scommand\sline\sin\sthe\sMSVC\smakefile.
+D 2012-08-17T11:47:32.116
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
+F Makefile.msc e89bdb795a841e58169ef9e26e543096dfc17c24
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -163,7 +163,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
-F src/os_win.c 370c6f3399e3cd9f14343fb7dc4b2bbe8619d3bf
+F src/os_win.c b8fc659987a678c7924796585f5ae293ba5c896d
 F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 772d0de3f311f2035f8a42f01371c96c9fa587ce
-R 5cf52533788596320f4b8771261628f7
-U drh
-Z bf22097f18dc13a1f07a9f39f12dbcca
+P 31c07db2560ee867723c41cdb634e2aa7993634d
+R a24bc21b8130ed9119365f8bb12a4fa8
+U mistachkin
+Z 0c3c87285201e10a599643fc4fe047d3
diff --git a/manifest.uuid b/manifest.uuid
index a265920d2b..1498a31ced 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-31c07db2560ee867723c41cdb634e2aa7993634d
\ No newline at end of file
+61b1ae121782525b37882a559d0fbb7c85237fd5
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 2cbd2cee54..bb5fae133a 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -46,9 +46,11 @@
 # define FILE_ATTRIBUTE_MASK     (0x0003FFF7)
 #endif
 
+#ifndef SQLITE_OMIT_WAL
 /* Forward references */
 typedef struct winShm winShm;           /* A connection to shared-memory */
 typedef struct winShmNode winShmNode;   /* A region of shared-memory */
+#endif
 
 /*
 ** WinCE lacks native support for file locking so we have to fake it
@@ -76,7 +78,9 @@ struct winFile {
   short sharedLockByte;   /* Randomly chosen byte used as a shared lock */
   u8 ctrlFlags;           /* Flags.  See WINFILE_* below */
   DWORD lastErrno;        /* The Windows errno from the last I/O error */
+#ifndef SQLITE_OMIT_WAL
   winShm *pShm;           /* Instance of shared memory on this file */
+#endif
   const char *zPath;      /* Full pathname of this file */
   int szChunk;            /* Chunk size configured by FCNTL_CHUNK_SIZE */
 #if SQLITE_OS_WINCE
@@ -1930,7 +1934,9 @@ static int winClose(sqlite3_file *id){
   winFile *pFile = (winFile*)id;
 
   assert( id!=0 );
+#ifndef SQLITE_OMIT_WAL
   assert( pFile->pShm==0 );
+#endif
   OSTRACE(("CLOSE %d\n", pFile->h));
   do{
     rc = osCloseHandle(pFile->h);
@@ -3680,7 +3686,9 @@ static int winOpen(
   pFile->h = h;
   pFile->lastErrno = NO_ERROR;
   pFile->pVfs = pVfs;
+#ifndef SQLITE_OMIT_WAL
   pFile->pShm = 0;
+#endif
   pFile->zPath = zName;
   if( sqlite3_uri_boolean(zName, "psow", SQLITE_POWERSAFE_OVERWRITE) ){
     pFile->ctrlFlags |= WINFILE_PSOW;