From a70f6a1b9599931fccd13b15a1700e61137f7e72 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 3 Feb 2016 11:42:43 +0100 Subject: Use build-in time functions of WEC2013 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Simon Hausmann --- src/3rdparty/ce-compat/ce_time.c | 3 +++ src/3rdparty/ce-compat/ce_time.h | 4 ++++ 2 files changed, 7 insertions(+) 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 #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 +#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__) */ -- cgit v1.2.1