Changed the #if used to turn on UNIX domain sockets to match what

is used in sckaddr.h so wxMAC will compile again.  If wxMAC/darwin
can actually use UNIX domain sockets then this change should
probably go the other way...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index c3ad40ca7ffbb9979809ae8b1e718fe565ecc364..372c1d627e2ee2572f6a4af3e1c752aca6e26ddf 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -89,7 +89,7 @@ static wxSockAddress *
 GetAddressFromName(const wxString& serverName, const wxString& host = _T(""))
 {
     // we always use INET sockets under non-Unix systems
 GetAddressFromName(const wxString& serverName, const wxString& host = _T(""))
 {
     // we always use INET sockets under non-Unix systems

-#ifdef __UNIX_LIKE__
+#if defined(__UNIX__) && !defined(__WXMAC__)

     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )
     // under Unix, if the server name looks like a path, create a AF_UNIX
     // socket instead of AF_INET one
     if ( serverName.Find(_T('/')) != wxNOT_FOUND )


@@ -181,11 +181,11 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   if ( ok )
   {
     unsigned char msg;
   if ( ok )
   {
     unsigned char msg;

-  
+

     // Send topic name, and enquire whether this has succeeded
     data_os->Write8(IPC_CONNECT);
     data_os->WriteString(topic);
     // Send topic name, and enquire whether this has succeeded
     data_os->Write8(IPC_CONNECT);
     data_os->WriteString(topic);

-  
+

     msg = data_is->Read8();
 
     // OK! Confirmation.
     msg = data_is->Read8();
 
     // OK! Confirmation.


@@ -522,7 +522,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
 
   int msg = 0;
   wxDataInputStream *codeci;
 
   int msg = 0;
   wxDataInputStream *codeci;

-  wxDataOutputStream *codeco; 
+  wxDataOutputStream *codeco;

   wxSocketStream *sockstrm;
   wxString topic_name = connection->m_topic;
   wxString item;
   wxSocketStream *sockstrm;
   wxString topic_name = connection->m_topic;
   wxString item;


@@ -547,9 +547,9 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
   case IPC_EXECUTE:
   {
     char *data;
   case IPC_EXECUTE:
   {
     char *data;

-    size_t size; 
+    size_t size;

     wxIPCFormat format;
     wxIPCFormat format;

-    
+

     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     data = new char[size];


@@ -571,7 +571,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     size = codeci->Read32();
     data = new char[size];
     sockstrm->Read(data, size);
     size = codeci->Read32();
     data = new char[size];
     sockstrm->Read(data, size);

-    
+

     connection->OnAdvise (topic_name, item, data, size, format);
 
     delete [] data;
     connection->OnAdvise (topic_name, item, data, size, format);
 
     delete [] data;


@@ -612,7 +612,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
     size = codeci->Read32();
     data = new wxChar[size];
     sockstrm->Read(data, size);
     size = codeci->Read32();
     data = new wxChar[size];
     sockstrm->Read(data, size);

-    
+

     connection->OnPoke (topic_name, item, data, size, format);
 
     delete [] data;
     connection->OnPoke (topic_name, item, data, size, format);
 
     delete [] data;


@@ -699,7 +699,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
         // Acknowledge success
         codeco->Write8(IPC_CONNECT);
         new_connection->m_topic = topic_name;
         // Acknowledge success
         codeco->Write8(IPC_CONNECT);
         new_connection->m_topic = topic_name;

-        new_connection->m_sock = sock;      
+        new_connection->m_sock = sock;

         new_connection->m_sockstrm = stream;
         new_connection->m_codeci = codeci;
         new_connection->m_codeco = codeco;
         new_connection->m_sockstrm = stream;
         new_connection->m_codeci = codeci;
         new_connection->m_codeco = codeco;