wxAtof implementation independent of (the rest of) wxNEED_WX_STDLIB_H

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 0057aba2710b72ea295e21d84e959322dea2ecb7..85c6bfc71685129148d72d8d21fb4f4f3e8d9429 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -133,12 +133,14 @@ int WXDLLEXPORT wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr)
 }
 #endif
 
 }
 #endif
 

-#ifdef wxNEED_WX_STDLIB_H
+#ifndef wxAtof

 double   WXDLLEXPORT wxAtof(const wxChar *psz)
 {
   return atof(wxConv_libc.cWX2MB(psz));
 }
 double   WXDLLEXPORT wxAtof(const wxChar *psz)
 {
   return atof(wxConv_libc.cWX2MB(psz));
 }

+#endif

 
 

+#ifdef wxNEED_WX_STDLIB_H

 int      WXDLLEXPORT wxAtoi(const wxChar *psz)
 {
   return atoi(wxConv_libc.cWX2MB(psz));
 int      WXDLLEXPORT wxAtoi(const wxChar *psz)
 {
   return atoi(wxConv_libc.cWX2MB(psz));