From: mistachkin <mistachkin@noemail.net>
Date: Mon, 11 Apr 2016 22:45:45 +0000 (+0000)
Subject: Further refinements.
X-Git-Tag: version-3.13.0~96^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cedb963a3c0af74b77ede4a333ead2bc221eced;p=thirdparty%2Fsqlite.git

Further refinements.

FossilOrigin-Name: b35bb928b25492f6dd71ccf9c250cb9f0cce09ff
---

diff --git a/manifest b/manifest
index 4bfcc161a3..9eda7911ed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2016-04-11T22:24:03.058
+C Further\srefinements.
+D 2016-04-11T22:45:45.699
 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 cd412cb2adb0c3a60e085107864931e508f45ad8
+F src/date.c b25819151358a5598a1beaf0da370692ce4a70d1
 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 1245c1c1b03f269f8beca1464df2f9a174236dab
+F src/os_win.c 9c84a48d56074d36866775a76089da69acb21594
 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 016481b39f8b23b4f0f851053068d8eaee6122e1 3189a7f1851f823218d85a2455bf218d00d81543
-R 7558a8a571dae2778f18625aa658ad38
+P b8094166b3c6a8ec7913b403e08b5e6790fb03c1
+R 10b47efb260a3b41bbe92a309e042fe1
 U mistachkin
-Z b10810d48122d46da89a3713378b4792
+Z 8cdaf1bfaef399409db07428454eae07
diff --git a/manifest.uuid b/manifest.uuid
index e418fefec5..3add6fef53 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8094166b3c6a8ec7913b403e08b5e6790fb03c1
\ No newline at end of file
+b35bb928b25492f6dd71ccf9c250cb9f0cce09ff
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index 02f7d4f01f..182b7d594d 100644
--- a/src/date.c
+++ b/src/date.c
@@ -50,6 +50,14 @@
 
 #ifndef SQLITE_OMIT_DATETIME_FUNCS
 
+/*
+** The MSVC CRT on Windows CE may not have a localtime() function.  So
+** declare a substitute.
+*/
+#if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \
+    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
+struct tm *__cdecl localtime(const time_t *);
+#endif
 
 /*
 ** A structure for holding a single date and time.
diff --git a/src/os_win.c b/src/os_win.c
index 698c5af861..d6156d7bbf 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -25,16 +25,6 @@
 */
 #include "os_win.h"
 
-/*
-** The MSVC CRT on Windows CE may not have a localtime() function.  So
-** declare a substitute.
-*/
-#if SQLITE_OS_WINCE && \
-    (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
-#  include <time.h>
-struct tm *__cdecl localtime(const time_t *);
-#endif
-
 /*
 ** Compiling and using WAL mode requires several APIs that are only
 ** available in Windows platforms based on the NT kernel.
@@ -2132,8 +2122,9 @@ static void winLogIoerr(int nRetry, int lineno){
 ** The MSVC CRT on Windows CE may not have a localtime() function.  So
 ** define a substitute.
 */
-#if SQLITE_OS_WINCE && \
+#if !defined(SQLITE_OMIT_LOCALTIME) && defined(_WIN32_WCE) && \
     (!defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API)
+#  include <time.h>
 struct tm *__cdecl localtime(const time_t *t)
 {
   static struct tm y;