Rebake trunk after wxWebView merge and add missing project files for the wxWebView...

[wxWidgets.git] / include / wx / msw / wince / time.h

diff --git a/include/wx/msw/wince/time.h b/include/wx/msw/wince/time.h
index f56f31bee8fa462f4946b734a65847c2fbfc03fb..d711111c897840233ddcb94ab19a9ad459864e28 100644 (file)
--- a/include/wx/msw/wince/time.h
+++ b/include/wx/msw/wince/time.h
@@ -4,8 +4,12 @@
  * Missing time functions and structures for use under WinCE
  */
 
  * Missing time functions and structures for use under WinCE
  */
 

-#ifndef __WINCE_TIME_
-#define __WINCE_TIME_
+#ifndef _WX_MSW_WINCE_TIME_H_
+#define _WX_MSW_WINCE_TIME_H_
+
+#ifndef _TM_DEFINED
+
+#define _TM_DEFINED

 
 struct tm {
         int tm_sec;     /* seconds after the minute - [0,59] */
 
 struct tm {
         int tm_sec;     /* seconds after the minute - [0,59] */


@@ -19,20 +23,31 @@ struct tm {
         int tm_isdst;   /* daylight savings time flag */
         };
 
         int tm_isdst;   /* daylight savings time flag */
         };
 

-struct tm * __cdecl localtime(const time_t *);
+extern "C"
+{

 
 time_t __cdecl time(time_t *);
 
 time_t __cdecl mktime(struct tm *);
 
 
 time_t __cdecl time(time_t *);
 
 time_t __cdecl mktime(struct tm *);
 

+// VC8 CRT provides the other functions
+#if !defined(__VISUALC__) || (__VISUALC__ < 1400)
+
+struct tm * __cdecl localtime(const time_t *);
+

 struct tm * __cdecl gmtime(const time_t *);
 
 #define _tcsftime   wcsftime
 
 struct tm * __cdecl gmtime(const time_t *);
 
 #define _tcsftime   wcsftime
 

-size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *,
-        const struct tm *);
+size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *);

 
 extern long timezone;
 
 
 extern long timezone;
 

-#endif
+#endif // !VC8
+
+}
+
+#endif // !_TM_DEFINED
+
+#endif // _WX_MSW_WINCE_TIME_H_