X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3ea65274fc7a9c96cf71829030bfb324a75a377..243d4b360385d3364e96d5600f693139e359fb3b:/src/common/sckaddr.cpp?ds=sidebyside

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 8131c0427a..93e0ab3266 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
 #ifdef ENABLE_IPV6
 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
 #endif
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)
 IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
 #endif
 
@@ -108,7 +108,7 @@ bool wxIPV4address::Hostname(const wxString& name)
     return FALSE;
   }
 
-  return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
@@ -118,7 +118,7 @@ bool wxIPV4address::Hostname(unsigned long addr)
 
 bool wxIPV4address::Service(const wxString& name)
 {
-  return (GAddress_INET_SetPortName(m_address, name.fn_str(), "tcp") == GSOCK_NOERROR);
+  return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Service(unsigned short port)
@@ -201,7 +201,7 @@ unsigned short wxIPV6address::Service()
 
 #endif
 
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)
 // ---------------------------------------------------------------------------
 // wxUNIXaddress
 // ---------------------------------------------------------------------------