AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the SQLite3 build for WEC2013 again.

Browse Source 
The new version broke the build again
-> fix it again.

(cherry picked from commit af2f3bde48)
Change-Id: Ifcc33fbd9f7d7e98901de5130a67501ba19d9895
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
This commit is contained in:
Andreas Holzammer 2016-03-03 10:28:25 +01:00 committed by Kevin Funk
parent 21c7421d4e
commit 2263e5e0aa
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/3rdparty/sqlite/0001-Fixing-the-SQLite3-build-for-WEC2013-again.patch vendored Normal file
View File

@ -0,0 +1,33 @@
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
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
--- a/src/3rdparty/sqlite/sqlite3.c
+++ b/src/3rdparty/sqlite/sqlite3.c
@@ -15474,9 +15474,11 @@ 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);
+#elif defined(_WIN32_WCE) && _WIN32_WCE >= 0x800
+# define SQLITE_MSVC_LOCALTIME_API 1
#endif
#ifndef SQLITE_OMIT_LOCALTIME
--
1.8.1.msysgit.1

4
src/3rdparty/sqlite/sqlite3.c vendored
View File

@ -15742,9 +15742,11 @@ 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);
#elif defined(_WIN32_WCE) && _WIN32_WCE >= 0x800
# define SQLITE_MSVC_LOCALTIME_API 1
#endif
#ifndef SQLITE_OMIT_LOCALTIME