diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:00:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:00:03 +0100 |
| commit | 0af88dc973d3410cdd905265ce935916693b2d44 (patch) | |
| tree | 44b0196250538538c53a09a7b70c1f34f1ba3afd /src/3rdparty/ce-compat/ce_time.h | |
| parent | d80f57f60f39bb98948e22e94036104ddabd5e2b (diff) | |
| parent | 525c18f7780a39474e71790d54cf90de29bc1fd6 (diff) | |
| download | qtscript-0af88dc973d3410cdd905265ce935916693b2d44.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I125a7421f2d449b5670fbb250ad167d97f156fff
Diffstat (limited to 'src/3rdparty/ce-compat/ce_time.h')
| -rw-r--r-- | src/3rdparty/ce-compat/ce_time.h | 4 |
1 files changed, 4 insertions, 0 deletions
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__) */ |