update bundled sqlite to 3.10.0.2
Thanks to gunnar.roth@gmx.net for updating the WinCE patch. Change-Id: I131e0ee9141efdbd377e096aae0959311a601830 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
parent
d9229d849f
commit
dae6445e26
@ -1,33 +1,31 @@
|
||||
From c7bbe85015995c1e0627d88bac6fd5715b1338a0 Mon Sep 17 00:00:00 2001
|
||||
From: Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com>
|
||||
Date: Fri, 3 Jul 2015 14:08:04 +0200
|
||||
From 448df48c1610745cad734df210aa2f21f26c9ae4 Mon Sep 17 00:00:00 2001
|
||||
From: Gunnar Roth <gunnar.roth@gmx.net>
|
||||
Date: Fri, 22 Jan 2016 22:38:17 +0100
|
||||
Subject: [PATCH] Fixing the SQLite3 build for WEC2013 again.
|
||||
|
||||
The new version broke the build again
|
||||
-> fix it again.
|
||||
|
||||
Change-Id: I75761d134d97a2784f1de5076412aa814fdf9bcd
|
||||
---
|
||||
src/3rdparty/sqlite/sqlite3.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
|
||||
index 71f6c10..040a9e1 100644
|
||||
index c0ab233..b397726 100644
|
||||
--- a/src/3rdparty/sqlite/sqlite3.c
|
||||
+++ b/src/3rdparty/sqlite/sqlite3.c
|
||||
@@ -15474,9 +15474,11 @@ static void clearYMD_HMS_TZ(DateTime *p){
|
||||
@@ -16867,6 +16867,13 @@ static void clearYMD_HMS_TZ(DateTime *p){
|
||||
#define HAVE_LOCALTIME_S 1
|
||||
#endif
|
||||
|
||||
-#if defined(_WIN32_WCE)
|
||||
+#if defined(_WIN32_WCE) && _WIN32_WCE < 0x800
|
||||
#undef HAVE_LOCALTIME_S
|
||||
struct tm *__cdecl localtime(const time_t *t);
|
||||
+#undef HAVE_LOCALTIME_S
|
||||
+struct tm *__cdecl localtime(const time_t *t);
|
||||
+#elif defined(_WIN32_WCE) && _WIN32_WCE >= 0x800
|
||||
+# define SQLITE_MSVC_LOCALTIME_API 1
|
||||
#endif
|
||||
|
||||
+#define SQLITE_MSVC_LOCALTIME_API 1
|
||||
+#endif
|
||||
+
|
||||
#ifndef SQLITE_OMIT_LOCALTIME
|
||||
/*
|
||||
** The following routine implements the rough equivalent of localtime_r()
|
||||
--
|
||||
1.8.1.msysgit.1
|
||||
2.5.0
|
||||
|
||||
|
844
src/3rdparty/sqlite/shell.c
vendored
844
src/3rdparty/sqlite/shell.c
vendored
File diff suppressed because it is too large
Load Diff
47711
src/3rdparty/sqlite/sqlite3.c
vendored
47711
src/3rdparty/sqlite/sqlite3.c
vendored
File diff suppressed because it is too large
Load Diff
931
src/3rdparty/sqlite/sqlite3.h
vendored
931
src/3rdparty/sqlite/sqlite3.h
vendored
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user