diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:53 +0100 |
| commit | 525c18f7780a39474e71790d54cf90de29bc1fd6 (patch) | |
| tree | ee789411438543a61805c8e2c5da36019648d533 | |
| parent | a5e814fd8809dd6a8a3c3efd4b911b36e3325a2a (diff) | |
| parent | a70f6a1b9599931fccd13b15a1700e61137f7e72 (diff) | |
| download | qtscript-525c18f7780a39474e71790d54cf90de29bc1fd6.tar.gz | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Idf3aa3e2ec24a79adec9aa964b64c17f034d719e
| -rw-r--r-- | src/3rdparty/ce-compat/ce_time.c | 3 | ||||
| -rw-r--r-- | src/3rdparty/ce-compat/ce_time.h | 4 |
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__) */ |