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

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

Browse Source 
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
This commit is contained in:
Robin Dunn
2002-04-13 02:46:21 +00:00
parent 94c162795e
commit 26a25f9523
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/sckipc.cpp
View File

@@ -89,7 +89,7 @@ static wxSockAddress *
GetAddressFromName(const wxString& serverName, const wxString& host = _T("")) GetAddressFromName(const wxString& serverName, const wxString& host = _T(""))
{ {
// we always use INET sockets under non-Unix systems // 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 // under Unix, if the server name looks like a path, create a AF_UNIX
// socket instead of AF_INET one // socket instead of AF_INET one
if ( serverName.Find(_T('/')) != wxNOT_FOUND ) if ( serverName.Find(_T('/')) != wxNOT_FOUND )
@@ -181,11 +181,11 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
if ( ok ) if ( ok )
{ {
unsigned char msg; unsigned char msg;
// Send topic name, and enquire whether this has succeeded // Send topic name, and enquire whether this has succeeded
data_os->Write8(IPC_CONNECT); data_os->Write8(IPC_CONNECT);
data_os->WriteString(topic); data_os->WriteString(topic);
msg = data_is->Read8(); msg = data_is->Read8();
// OK! Confirmation. // OK! Confirmation.
@@ -522,7 +522,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
int msg = 0; int msg = 0;
wxDataInputStream *codeci; wxDataInputStream *codeci;
wxDataOutputStream *codeco; wxDataOutputStream *codeco;
wxSocketStream *sockstrm; wxSocketStream *sockstrm;
wxString topic_name = connection->m_topic; wxString topic_name = connection->m_topic;
wxString item; wxString item;
@@ -547,9 +547,9 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
case IPC_EXECUTE: case IPC_EXECUTE:
{ {
char *data; char *data;
size_t size; size_t size;
wxIPCFormat format; wxIPCFormat format;
format = (wxIPCFormat)codeci->Read8(); format = (wxIPCFormat)codeci->Read8();
size = codeci->Read32(); size = codeci->Read32();
data = new char[size]; data = new char[size];
@@ -571,7 +571,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
size = codeci->Read32(); size = codeci->Read32();
data = new char[size]; data = new char[size];
sockstrm->Read(data, size); sockstrm->Read(data, size);
connection->OnAdvise (topic_name, item, data, size, format); connection->OnAdvise (topic_name, item, data, size, format);
delete [] data; delete [] data;
@@ -612,7 +612,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
size = codeci->Read32(); size = codeci->Read32();
data = new wxChar[size]; data = new wxChar[size];
sockstrm->Read(data, size); sockstrm->Read(data, size);
connection->OnPoke (topic_name, item, data, size, format); connection->OnPoke (topic_name, item, data, size, format);
delete [] data; delete [] data;
@@ -699,7 +699,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
// Acknowledge success // Acknowledge success
codeco->Write8(IPC_CONNECT); codeco->Write8(IPC_CONNECT);
new_connection->m_topic = topic_name; new_connection->m_topic = topic_name;
new_connection->m_sock = sock; new_connection->m_sock = sock;
new_connection->m_sockstrm = stream; new_connection->m_sockstrm = stream;
new_connection->m_codeci = codeci; new_connection->m_codeci = codeci;
new_connection->m_codeco = codeco; new_connection->m_codeco = codeco;