X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/553d7089d0bde9cc3f724f411c95863ac081113a..4e0a055757f928dce8c53b8e4cb60a699ab43e07:/include/wx/msw/wince/time.h

diff --git a/include/wx/msw/wince/time.h b/include/wx/msw/wince/time.h
index 9b9e880623..d711111c89 100644
--- 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
  */
 
-#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] */
         int tm_min;     /* minutes after the hour - [0,59] */
@@ -24,24 +26,28 @@ struct tm {
 extern "C"
 {
 
-struct tm * __cdecl localtime(const time_t *);
-
 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 *);
 
-}
-
 extern long timezone;
 
-#endif
-    // old code
+#endif // !VC8
+
+}
+
+#endif // !_TM_DEFINED
 
-#endif // __WINCE_TIME_
+#endif // _WX_MSW_WINCE_TIME_H_