From 4c663122e48dfd9eca0170b0e56541efc211c996 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 15 Nov 2003 10:26:46 +0000
Subject: [PATCH] Fixes for previous fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/wxchar.h   | 8 +++++---
 src/common/wxchar.cpp | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ecf6f69753..41ad07a808 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -902,10 +902,12 @@ WXDLLIMPEXP_BASE int      wxSystem(const wxChar *psz);
                                   const wxChar *fmt, const struct tm *tm);
 #endif // wxNEED_WX_TIME_H
 
-// missing functions in early WinCE versions
-#if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
-WXDLLIMPEXP_BASE char* strdup(const char* s);
+// missing functions in some WinCE versions
+#ifdef _WIN32_WCE
+#if (_WIN32_WCE < 300)
 WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
+#endif
+WXDLLIMPEXP_BASE char* strdup(const char* s);
 
 #if _WIN32_WCE <= 211
 WXDLLIMPEXP_BASE int isspace(int c);
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 11233ff4fd..846e7d5058 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1390,12 +1390,14 @@ int isascii( int c )
 #endif
 
 #if defined(__WXWINCE__)
+#if (_WIN32_WCE < 300)
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }
+#endif
 
 #if (_WIN32_WCE <= 211)
 int isspace(int c)
@@ -1405,3 +1407,4 @@ int isspace(int c)
 #endif
 
 #endif
+
-- 
2.45.2