Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another attempt to fix strconv.cpp compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-11 12:19:06 +00:00
parent ecf8dd3596
commit eccf1b2c76
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -97,7 +97,7 @@ WXDLLEXPORT_DATA(wxMBConv *) wxConvCurrent = &wxConvLibc;
#ifdef WC_UTF16
static size_t encode_utf16(wxUint32 input, wxUint16 *output)
static size_t encode_utf16(wxUint32 input, wchar_t *output)
{
if (input<=0xffff)
{
@@ -119,7 +119,7 @@ static size_t encode_utf16(wxUint32 input, wxUint16 *output)
}
}
static size_t decode_utf16(const wxUint16* input, wxUint32& output)
static size_t decode_utf16(const wchar_t* input, wxUint32& output)
{
if ((*input<0xd800) || (*input>0xdfff))
{
@@ -357,7 +357,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
wxUint32 cc;
#ifdef WC_UTF16
size_t pa = decode_utf16((wchar_t*) psz,cc);
size_t pa = decode_utf16(psz, cc);
psz += (pa == (size_t)-1) ? 1 : pa;
#else
cc=(*psz++) & 0x7fffffff;