diff options
| author | Joerg Bornemann <joerg.bornemann@trolltech.com> | 2009-11-02 17:41:06 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-09 15:13:18 (GMT) |
| commit | 900c2dbe627346d298ee5ad3d10b42d7eb9d5c56 (patch) | |
| tree | 34f8bd79f6f7c087ae2fce215bf5f0dd425c07a5 /src/3rdparty/ce-compat | |
| parent | 3d2cb04d31cfa862c4d8aa383ae38b8b09e6546a (diff) | |
| download | Qt-900c2dbe627346d298ee5ad3d10b42d7eb9d5c56.zip Qt-900c2dbe627346d298ee5ad3d10b42d7eb9d5c56.tar.gz Qt-900c2dbe627346d298ee5ad3d10b42d7eb9d5c56.tar.bz2 | |
fix WebKit build on Windows CE 6
Again, we have fun with the C time functions on Windows CE.
On Windows CE 5: the functions are declared but not defined.
On Windows CE 6: the functions are neither declared nor defined.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/ce-compat')
| -rw-r--r-- | src/3rdparty/ce-compat/ce_time.c (renamed from src/3rdparty/ce-compat/ce_time.cpp) | 0 | ||||
| -rw-r--r-- | src/3rdparty/ce-compat/ce_time.h | 13 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/3rdparty/ce-compat/ce_time.cpp b/src/3rdparty/ce-compat/ce_time.c index 92efae0..92efae0 100644 --- a/src/3rdparty/ce-compat/ce_time.cpp +++ b/src/3rdparty/ce-compat/ce_time.c diff --git a/src/3rdparty/ce-compat/ce_time.h b/src/3rdparty/ce-compat/ce_time.h index 9d946e8..07ca094 100644 --- a/src/3rdparty/ce-compat/ce_time.h +++ b/src/3rdparty/ce-compat/ce_time.h @@ -2,15 +2,24 @@ #define __CE_TIME_H__ #if defined(_WIN32_WCE) && _WIN32_WCE >= 0x600 -// we need to prototype the time functions for Windows CE >= 6.0 +/* we need to prototype the time functions for Windows CE >= 6.0 */ #include <crtdefs.h> +#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); struct tm *localtime(const time_t *timer); -#endif +#ifdef __cplusplus +} /* closing brace for extern "C" */ #endif + +#endif /* defined(_WIN32_WCE) && _WIN32_WCE >= 0x600 */ + +#endif /* !defined(__CE_TIME_H__) */ |