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

The prevalent wide characters.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-13 11:44:33 +00:00
parent 2ed57eb790
commit 783b6cfda4
4 changed files with 144 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/sckaddr.cpp
View File

@@ -128,14 +128,14 @@ bool wxIPV4address::Hostname(const wxString& name)
return FALSE;
if (!name.IsNumber()) {
if ((theHostent = gethostbyname(name.GetData())) == 0) {
if ((theHostent = gethostbyname(name.fn_str())) == 0) {
return FALSE;
}
} else {
#ifdef __WXMAC__
long len_addr = inet_addr(name.GetData()).s_addr ;
long len_addr = inet_addr(name.fn_str()).s_addr ;
#else
long len_addr = inet_addr(name.GetData());
long len_addr = inet_addr(name.fn_str());
#endif
if (len_addr == -1)
return FALSE;
@@ -163,11 +163,11 @@ bool wxIPV4address::Service(const wxString& name)
return FALSE;
if (!name.IsNumber()) {
if ((theServent = getservbyname(name, "tcp")) == 0)
if ((theServent = getservbyname(name.fn_str(), "tcp")) == 0)
return FALSE;
} else {
if ((theServent = getservbyport(atoi(name), "tcp")) == 0) {
m_addr->sin_port = htons(atoi(name));
if ((theServent = getservbyport(wxAtoi(name), "tcp")) == 0) {
m_addr->sin_port = htons(wxAtoi(name));
return TRUE;
}
}
@@ -399,7 +399,7 @@ const wxSockAddress& wxUNIXaddress::operator =(const wxSockAddress& addr)
void wxUNIXaddress::Filename(const wxString& fname)
{
sprintf(m_addr->sun_path, "%s", WXSTRINGCAST fname);
sprintf(m_addr->sun_path, "%s", MBSTRINGCAST fname.mb_str());
}
wxString wxUNIXaddress::Filename()