Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[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 983eaf3eed8409ba8d285f9fd4113b282b23ec81..d711111c897840233ddcb94ab19a9ad459864e28 100644 (file)
--- a/include/wx/msw/wince/time.h
+++ b/include/wx/msw/wince/time.h
@@ -4,11 +4,13 @@
  * 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
 
 
 #ifndef _TM_DEFINED
 

+#define _TM_DEFINED
+

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


@@ -24,23 +26,28 @@ struct tm {
 extern "C"
 {
 
 extern "C"
 {
 

-struct tm * __cdecl localtime(const time_t *);
-

 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
 
 size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *);
 
 struct tm * __cdecl gmtime(const time_t *);
 
 #define _tcsftime   wcsftime
 
 size_t __cdecl wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *);
 

-}
-

 extern long timezone;
 
 extern long timezone;
 

+#endif // !VC8
+
+}
+

 #endif // !_TM_DEFINED
 
 #endif // !_TM_DEFINED
 

-#endif // __WINCE_TIME_
+#endif // _WX_MSW_WINCE_TIME_H_