In the Win32 VFS, use SQLITE_FCNTL_LAST_ERRNO instead of (the older) SQLITE_LAST_ERRNO.

FossilOrigin-Name: 9463762c437488970a87093ef13131c39b2adadc

diff --git a/manifest b/manifest
index 61ece923e26075763f4020ab4601c523f07791ab..e0adb2742ced12c976665d3fd8c42e842803ae7b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implement\sFROM-clause\ssubqueries\sas\sco-routines\swhenever\sthey\sare\sguaranteed\nto\sbe\sthe\souter-most\sloop\sof\sthe\sjoin.
-D 2016-03-15T17:52:12.224
+C In\sthe\sWin32\sVFS,\suse\sSQLITE_FCNTL_LAST_ERRNO\sinstead\sof\s(the\solder)\sSQLITE_LAST_ERRNO.
+D 2016-03-15T19:10:39.513
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -335,7 +335,7 @@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
-F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
+F src/os_win.c cbf8c442a0d818d05bcf40b093cb3ebad435b9be
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
@@ -1456,7 +1456,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 2fd095b14b03a508169bba710d2e8e2addf4b8f5
-R dae03fc18d1aaaa839efcf6d42490a7e
-U drh
-Z 042547ad8e59422492ad781582901ed5
+P c7bae50bdccb5bcf3bc22e8ac5bb6725ef13db39
+R 46123ac548d09b6e0ffa37ea5d80c14d
+U mistachkin
+Z d90a9a53fb7ea7a50e56b06b4f7c6bc4

diff --git a/manifest.uuid b/manifest.uuid
index b2a61f89c1d800b242bbbd6f633dc12922b504e0..14d29856701f7ad2b1e65f833582d2c935d4699a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7bae50bdccb5bcf3bc22e8ac5bb6725ef13db39
\ No newline at end of file
+9463762c437488970a87093ef13131c39b2adadc
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index af6b1c814c64c58aa5f1e885427bfc586ef19b9f..6ff50c554b7114ddae990ad63cc0b95d9178b64d 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3257,7 +3257,7 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
       OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
       return SQLITE_OK;
     }
-    case SQLITE_LAST_ERRNO: {
+    case SQLITE_FCNTL_LAST_ERRNO: {
       *(int*)pArg = (int)pFile->lastErrno;
       OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
       return SQLITE_OK;