Fixes for previous fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-11-15 10:26:46 +00:00
parent f942f48def
commit 4c663122e4
2 changed files with 8 additions and 3 deletions

View File

@ -902,10 +902,12 @@ WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz);
const wxChar *fmt, const struct tm *tm); const wxChar *fmt, const struct tm *tm);
#endif // wxNEED_WX_TIME_H #endif // wxNEED_WX_TIME_H
// missing functions in early WinCE versions // missing functions in some WinCE versions
#if defined(_WIN32_WCE) && (_WIN32_WCE < 300) #ifdef _WIN32_WCE
WXDLLIMPEXP_BASE char* strdup(const char* s); #if (_WIN32_WCE < 300)
WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#endif
WXDLLIMPEXP_BASE char* strdup(const char* s);
#if _WIN32_WCE <= 211 #if _WIN32_WCE <= 211
WXDLLIMPEXP_BASE int isspace(int c); WXDLLIMPEXP_BASE int isspace(int c);

View File

@ -1390,12 +1390,14 @@ int isascii( int c )
#endif #endif
#if defined(__WXWINCE__) #if defined(__WXWINCE__)
#if (_WIN32_WCE < 300)
void *calloc( size_t num, size_t size ) void *calloc( size_t num, size_t size )
{ {
void** ptr = (void **)malloc(num * size); void** ptr = (void **)malloc(num * size);
memset( ptr, 0, num * size); memset( ptr, 0, num * size);
return ptr; return ptr;
} }
#endif
#if (_WIN32_WCE <= 211) #if (_WIN32_WCE <= 211)
int isspace(int c) int isspace(int c)
@ -1405,3 +1407,4 @@ int isspace(int c)
#endif #endif
#endif #endif