diff options
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/date.c | 5 | ||||
| -rw-r--r-- | src/os_win.c | 8 |
4 files changed, 17 insertions, 12 deletions
@@ -1,5 +1,5 @@ -C Further\srefinements. -D 2016-04-11T22:45:45.699 +C Add\sand\sadjust\scomments. +D 2016-04-12T16:11:52.808 F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -326,7 +326,7 @@ F src/build.c 1944d95f0250ec72dab939f8319a12e237aaad61 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198 -F src/date.c b25819151358a5598a1beaf0da370692ce4a70d1 +F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e F src/expr.c 17d4e745ef6a3fd2e4ef863f5f9a4912f1ba1198 @@ -360,7 +360,7 @@ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b -F src/os_win.c 9c84a48d56074d36866775a76089da69acb21594 +F src/os_win.c b169437dff859e308b3726594094a2f8ca922941 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 @@ -1482,7 +1482,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 b8094166b3c6a8ec7913b403e08b5e6790fb03c1 -R 10b47efb260a3b41bbe92a309e042fe1 +P b35bb928b25492f6dd71ccf9c250cb9f0cce09ff +R 042928a9099251248649d958d8ea8130 U mistachkin -Z 8cdaf1bfaef399409db07428454eae07 +Z 2dd922c09a9ceb4b9c3491d0203a672b diff --git a/manifest.uuid b/manifest.uuid index 3add6fef5..376b8b575 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b35bb928b25492f6dd71ccf9c250cb9f0cce09ff
\ No newline at end of file +541c6da23850673f5d2a2e31c3967b796ee2effc
\ No newline at end of file diff --git a/src/date.c b/src/date.c index 182b7d594..cce16305a 100644 --- a/src/date.c +++ b/src/date.c @@ -51,8 +51,9 @@ #ifndef SQLITE_OMIT_DATETIME_FUNCS /* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** declare a substitute. +** The MSVC CRT on Windows CE may not have a localtime() function. +** So declare a substitute. The substitute function itself is +** defined in "os_win.c". */ #if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) diff --git a/src/os_win.c b/src/os_win.c index d6156d7bb..929ad346c 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2119,11 +2119,15 @@ static void winLogIoerr(int nRetry, int lineno){ } /* -** The MSVC CRT on Windows CE may not have a localtime() function. So -** define a substitute. +** This #if does not rely on the SQLITE_OS_WINCE define because the +** corresponding section in "date.c" cannot use it. */ #if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \ (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API) +/* +** The MSVC CRT on Windows CE may not have a localtime() function. +** So define a substitute. +*/ # include <time.h> struct tm *__cdecl localtime(const time_t *t) { |