Some C++Builder fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-15 19:53:30 +00:00
parent 8dfea369ea
commit d834f22c8e
3 changed files with 12 additions and 0 deletions
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -454,7 +454,11 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
    }
    return n;
  }
+#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+  return std::wcslen(psz);
+#else
  return ::wcslen(psz);
+#endif
 }

 #endif