wxWinCE compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4f4dc9b485ed8ba68a7d96b625df13bba08847b8..c76b7d7a210004c6241c0e9ecc1e8b995bc9111d 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -323,7 +323,7 @@
     #define  wxStrtol    _tcstol
     #define  wxStrtoul   _tcstoul
     #ifdef __VISUALC__
     #define  wxStrtol    _tcstol
     #define  wxStrtoul   _tcstoul
     #ifdef __VISUALC__

-        #if __VISUALC__ >= 1300
+        #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)

             #define wxStrtoll  _tcstoi64
             #define wxStrtoull _tcstoui64
         #endif /* VC++ 7+ */
             #define wxStrtoll  _tcstoi64
             #define wxStrtoull _tcstoui64
         #endif /* VC++ 7+ */


@@ -913,7 +913,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
             The only compiler with positional parameters support under Windows
             is VC++ 8.0 which provides a new xxprintf_p() functions family
          */
             The only compiler with positional parameters support under Windows
             is VC++ 8.0 which provides a new xxprintf_p() functions family
          */

-        #if defined(__VISUALC__) && __VISUALC__ >= 1400
+        #if defined(__VISUALC__) && __VISUALC__ >= 1400 && !defined(__WXWINCE__)

             #if wxUSE_UNICODE
                 #define wxVsnprintf_    _vswprintf_p
             #else
             #if wxUSE_UNICODE
                 #define wxVsnprintf_    _vswprintf_p
             #else

diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp
index d53f58b69faf136658686accfc632cd25fceeec6..a21f5f706de9eeca38664f077670095154534fa3 100644 (file)
--- a/src/msw/wince/time.cpp
+++ b/src/msw/wince/time.cpp
@@ -500,6 +500,9 @@ strftime(char * const s, const size_t maxsize, const char *format, const struct
 extern "C"
 {
 
 extern "C"
 {
 

+/* Not needed in VS Studio 2005, how about earlier versions? */
+
+#if 0

 size_t wcsftime(wchar_t *s,
                 const size_t maxsize,
                 const wchar_t *format,
 size_t wcsftime(wchar_t *s,
                 const size_t maxsize,
                 const wchar_t *format,


@@ -516,6 +519,7 @@ size_t wcsftime(wchar_t *s,
 
     return sz;
 }
 
     return sz;
 }

+#endif

 
 } /* extern "C" */
 
 
 } /* extern "C" */