summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/ce-compat
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-11-02 17:41:06 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-10 11:10:23 (GMT)
commitf80c224ddd3c3c4a408c8f88e6cf5114ee107c89 (patch)
tree15ba0fccc5700ceda254d4914169314f7e784461 /src/3rdparty/ce-compat
parentee9b774ae230d3fce0f33510f421e8e772536c1d (diff)
downloadQt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.zip
Qt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.tar.gz
Qt-f80c224ddd3c3c4a408c8f88e6cf5114ee107c89.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.h13
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__) */