summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer@kdab.com>2016-02-03 11:42:43 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-03 12:46:12 +0000
commita70f6a1b9599931fccd13b15a1700e61137f7e72 (patch)
tree4a32419b5e9f3b65f46eb94640acaff94350dd50 /src/3rdparty
parent19c0ae1d8e58d1aaa4b71e5fc326bf5d04bc050b (diff)
downloadqtscript-a70f6a1b9599931fccd13b15a1700e61137f7e72.tar.gz
Use build-in time functions of WEC2013v5.6.0-rc1v5.6.05.6.0
Time functions are supported with WEC2013 and do not need to be implemented. Task-number: QTBUG-50851 Change-Id: I4344b85808bd34467f239bf299b82e969544b7cb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/ce-compat/ce_time.c3
-rw-r--r--src/3rdparty/ce-compat/ce_time.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/ce-compat/ce_time.c b/src/3rdparty/ce-compat/ce_time.c
index 92efae0..37ac523 100644
--- a/src/3rdparty/ce-compat/ce_time.c
+++ b/src/3rdparty/ce-compat/ce_time.c
@@ -42,6 +42,7 @@
#include <time.h>
#include "ce_time.h"
+#if _WIN32_WCE < 0x800
time_t
time(time_t* timer)
{
@@ -675,3 +676,5 @@ localtime(const time_t *timer)
{
return gmtime(timer);
}
+
+#endif
diff --git a/src/3rdparty/ce-compat/ce_time.h b/src/3rdparty/ce-compat/ce_time.h
index 07ca094..6cd33e1 100644
--- a/src/3rdparty/ce-compat/ce_time.h
+++ b/src/3rdparty/ce-compat/ce_time.h
@@ -5,12 +5,14 @@
/* we need to prototype the time functions for Windows CE >= 6.0 */
#include <crtdefs.h>
+#if _WIN32_WCE < 0x800
#ifdef __cplusplus
extern "C" {
#endif
struct tm;
+
time_t time(time_t* timer);
time_t mktime(struct tm *t);
size_t strftime(char * const s, const size_t maxsize, const char * const format, const struct tm * const t);
@@ -20,6 +22,8 @@ struct tm *localtime(const time_t *timer);
} /* closing brace for extern "C" */
#endif
+#endif // _WIN32_WCE < 0x800
+
#endif /* defined(_WIN32_WCE) && _WIN32_WCE >= 0x600 */
#endif /* !defined(__CE_TIME_H__) */