From: mistachkin <mistachkin@noemail.net>
Date: Thu, 7 Feb 2013 05:12:25 +0000 (+0000)
Subject: Add the ability to skip defining the localtime() function when being compiled for... 
X-Git-Tag: version-3.7.16~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bfe1df01b4ca52f8216dffe89e80eae2131c5a1;p=thirdparty%2Fsqlite.git

Add the ability to skip defining the localtime() function when being compiled for WinCE.

FossilOrigin-Name: e1640876df7ed6fb4e84292e5ce1f78635df64ab
---

diff --git a/manifest b/manifest
index 31ac62e352..26c7dbce05 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sdebugging\slogic\saccidently\sleft\sin\sthe\slimit.test\smodule.
-D 2013-01-30T01:46:06.896
+C Add\sthe\sability\sto\sskip\sdefining\sthe\slocaltime()\sfunction\swhen\sbeing\scompiled\sfor\sWinCE.
+D 2013-02-07T05:12:25.598
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -161,7 +161,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c dfdc04b126f7b05dcb2e2cc5c1262f98acbb49d9
-F src/os_win.c ce1f5db8a7bb4d6f2092b1b2cb9631bec54a6320
+F src/os_win.c d19aae35a7b06f3dbaebb033eff5a68903856791
 F src/pager.c 4092c907222cfd451c74fe6bd2fd64b342f7190f
 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
@@ -1034,7 +1034,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 497ee36cb8d07c936e6896135163c5cd7e94bdde
-R 8631ea06030b6f0bbf98e234aaa48a26
-U drh
-Z 6b49c42c9eab49f950915ec166638d14
+P 7d346250e8a212880c4635a455cc9c98a1395c4c
+R 67f010e06a589b4f3cacdf24185f6947
+U mistachkin
+Z 545e88ce182d63880d035c13790df377
diff --git a/manifest.uuid b/manifest.uuid
index af2123536f..ca087eb31d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d346250e8a212880c4635a455cc9c98a1395c4c
\ No newline at end of file
+e1640876df7ed6fb4e84292e5ce1f78635df64ab
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 107370c41b..0b7c0049aa 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1621,9 +1621,10 @@ static void logIoerr(int nRetry){
 /*************************************************************************
 ** This section contains code for WinCE only.
 */
+#if !defined(SQLITE_MSVC_LOCALTIME_API) || !SQLITE_MSVC_LOCALTIME_API
 /*
-** Windows CE does not have a localtime() function.  So create a
-** substitute.
+** The MSVC CRT on Windows CE may not have a localtime() function.  So
+** create a substitute.
 */
 #include <time.h>
 struct tm *__cdecl localtime(const time_t *t)
@@ -1647,6 +1648,7 @@ struct tm *__cdecl localtime(const time_t *t)
   y.tm_sec = pTm.wSecond;
   return &y;
 }
+#endif
 
 #define HANDLE_TO_WINFILE(a) (winFile*)&((char*)a)[-(int)offsetof(winFile,h)]