applied patch 473558: fixes for CW compilation under MSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-23 20:43:23 +00:00
parent 2c37aade57
commit de85a884d7
9 changed files with 43 additions and 9 deletions

View File

@@ -71,7 +71,8 @@ public:
wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
if (wcs) {
#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
|| ( defined(__MWERKS__) && defined(__WXMSW__) )
size_t siz = (std::wcslen(wcs)+1)*sizeof(wchar_t);
#else
size_t siz = (::wcslen(wcs)+1)*sizeof(wchar_t);

View File

@@ -66,7 +66,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// ----------------------------------------------------------------------------
// Microsoft compiler loves underscores, feed them to it
#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 )
#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 ) \
|| ( defined(__MWERKS__) && defined(__WXMSW__) )
// functions
#define wxClose _close
#define wxRead _read