From: drh <drh@noemail.net>
Date: Fri, 22 Jan 2016 19:44:03 +0000 (+0000)
Subject: Reenable the xCurrentTime and xGetLastError methods on the unix VFSes as long
X-Git-Tag: version-3.11.0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3dfa5eba74db8eae0dddff1424b24e7f5873dbe;p=thirdparty%2Fsqlite.git

Reenable the xCurrentTime and xGetLastError methods on the unix VFSes as long
as SQLITE_OMIT_DEPRECATED is not defined.

FossilOrigin-Name: c11c85fdb6514cae54bb44945cc197dcaba72307
---

diff --git a/manifest b/manifest
index 6c3814c3d9..566db8de82 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3TokenInit()\sutility\sfunction.
-D 2016-01-22T17:48:09.470
+C Reenable\sthe\sxCurrentTime\sand\sxGetLastError\smethods\son\sthe\sunix\sVFSes\sas\slong\nas\sSQLITE_OMIT_DEPRECATED\sis\snot\sdefined.
+D 2016-01-22T19:44:03.065
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d2b93511a969c0c8fcf52aeb5e426571e8c610d2
@@ -329,7 +329,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c b509b49b40a269e7b75ab511b6e92b2dc9444359
+F src/os_unix.c 0eb7f469fcd4e1fbedf30060438e26b839ec5486
 F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c f4e9ac39fbb1e0fde97af85c0f4e00eb90764b67
@@ -1419,7 +1419,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e60461e984b8df09256bb0d733dbfae52568a145
-R 03ab6310cefadc63b5c7c7da966c2348
+P 7323175337b7ba85ac932ca892b28860f6a5b688
+R 4fcfc780a1da751b6f90e6d6f3ced841
 U drh
-Z 0c42ba520d71deaa3e0a21b23ff67f9d
+Z 703592c4495d8a71fd67fbd54e7f3927
diff --git a/manifest.uuid b/manifest.uuid
index e9fd60917b..a853332581 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7323175337b7ba85ac932ca892b28860f6a5b688
\ No newline at end of file
+c11c85fdb6514cae54bb44945cc197dcaba72307
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 5bd6116945..ee9b55674b 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6187,7 +6187,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){
   return rc;
 }
 
-#if 0 /* Not used */
+#ifndef SQLITE_OMIT_DEPRECATED
 /*
 ** Find the current time (in Universal Coordinated Time).  Write the
 ** current time and date as a Julian Day number into *prNow and
@@ -6205,7 +6205,7 @@ static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){
 # define unixCurrentTime 0
 #endif
 
-#if 0  /* Not used */
+#ifndef SQLITE_OMIT_DEPRECATED
 /*
 ** We added the xGetLastError() method with the intention of providing
 ** better low-level error messages when operating-system problems come up