Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxWinCE compile fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-10-31 15:07:00 +00:00
parent bd35c0f577
commit 79f82e1f66
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/wxchar.h
View File

@@ -323,7 +323,7 @@
#define wxStrtol _tcstol #define wxStrtol _tcstol
#define wxStrtoul _tcstoul #define wxStrtoul _tcstoul
#ifdef __VISUALC__ #ifdef __VISUALC__
#if __VISUALC__ >= 1300 #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)
#define wxStrtoll _tcstoi64 #define wxStrtoll _tcstoi64
#define wxStrtoull _tcstoui64 #define wxStrtoull _tcstoui64
#endif /* VC++ 7+ */ #endif /* VC++ 7+ */
@@ -913,7 +913,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
The only compiler with positional parameters support under Windows The only compiler with positional parameters support under Windows
is VC++ 8.0 which provides a new xxprintf_p() functions family 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 #if wxUSE_UNICODE
#define wxVsnprintf_ _vswprintf_p #define wxVsnprintf_ _vswprintf_p
#else #else

4
src/msw/wince/time.cpp
View File

@@ -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, size_t wcsftime(wchar_t *s,
const size_t maxsize, const size_t maxsize,
const wchar_t *format, const wchar_t *format,
@@ -516,6 +519,7 @@ size_t wcsftime(wchar_t *s,
return sz; return sz;
} }
#endif
} /* extern "C" */ } /* extern "C" */