cut-and-paste is not good idea, removed duplicated code

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 326c34dbe61aca75fb7d8d6046900bd0331623bf..e26ea1f3cb51d995fb7b51f3120c979e2f9dde74 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1392,8 +1392,8 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 

-#if defined( __MWERKS__ ) && !defined(__MACH__)
-#if __MSL__ < 0x00008000
+#if (defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)) || \
+     defined(__WXWINCE__)

 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;
 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;


@@ -1402,21 +1402,15 @@ char *strdup(const char *s)
     return dest ;
 }
 #endif
     return dest ;
 }
 #endif

-int isascii( int c )
-{
-        return ( c >= 0 && c < 128 ) ;
-}
-#endif // __MWERKS__

 
 

-#ifdef __WXWINCE__
-char* strdup(const char* s)
+#if (defined(__MWERKS__) && !defined(__MACH__)) || defined(__WXWINCE__)
+int isascii( int c )

 {
 {

-    char *dest = (char*) malloc( strlen( s ) + 1 ) ;
-    if ( dest )
-        strcpy( dest , s ) ;
-    return dest ;
+    return ( c >= 0 && c < 128 );

 }
 }

+#endif

 
 

+#if defined(__WXWINCE__)

 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);


@@ -1428,11 +1422,4 @@ int isspace(int c)
 {
     return (c == ' ');
 }
 {
     return (c == ' ');
 }

-
-int isascii( int c )
-{
-        return ( c >= 0 && c < 128 ) ;
-}

 #endif
 #endif

-
-