OLD | NEW |
(Empty) | |
| 1 From 664d0db451aeb1bb2bc808391a467a42eb8f4d23 Mon Sep 17 00:00:00 2001 |
| 2 From: Scott Hess <shess@chromium.org> |
| 3 Date: Mon, 25 Jan 2016 14:03:41 -0800 |
| 4 Subject: [PATCH 11/11] [backport] Reenable deprecated methods on unix VFS. |
| 5 |
| 6 In SQLite 3.10.2, the Unix VFS no longer defines unixCurrentTime(), |
| 7 instead relying on unixCurrentTimeInt64(). The websql vfs wrapper |
| 8 wraps at the v1 level, so expected to see xCurrentTime(). |
| 9 |
| 10 http://www.sqlite.org/src/info/c11c85fdb6514cae |
| 11 |
| 12 "Reenable the xCurrentTime and xGetLastError methods on the |
| 13 unix VFSes as long as SQLITE_OMIT_DEPRECATED is not defined." |
| 14 --- |
| 15 third_party/sqlite/src/src/os_unix.c | 4 ++-- |
| 16 1 file changed, 2 insertions(+), 2 deletions(-) |
| 17 |
| 18 diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/o
s_unix.c |
| 19 index 523cad6..e1228e3 100644 |
| 20 --- a/third_party/sqlite/src/src/os_unix.c |
| 21 +++ b/third_party/sqlite/src/src/os_unix.c |
| 22 @@ -6216,7 +6216,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqli
te3_int64 *piNow){ |
| 23 return rc; |
| 24 } |
| 25 |
| 26 -#if 0 /* Not used */ |
| 27 +#ifndef SQLITE_OMIT_DEPRECATED |
| 28 /* |
| 29 ** Find the current time (in Universal Coordinated Time). Write the |
| 30 ** current time and date as a Julian Day number into *prNow and |
| 31 @@ -6234,7 +6234,7 @@ static int unixCurrentTime(sqlite3_vfs *NotUsed, double *p
rNow){ |
| 32 # define unixCurrentTime 0 |
| 33 #endif |
| 34 |
| 35 -#if 0 /* Not used */ |
| 36 +#ifndef SQLITE_OMIT_DEPRECATED |
| 37 /* |
| 38 ** We added the xGetLastError() method with the intention of providing |
| 39 ** better low-level error messages when operating-system problems come up |
| 40 -- |
| 41 2.7.0 |
| 42 |
OLD | NEW |