message output for darwin into console, cannot use the normal converters as these...

[wxWidgets.git] / src / common / sckipc.cpp

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 4151df71729c844ca631a4eefc974b93905308f6..03e8f0958ea20fd70d09e89edb77903f97e115e5 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -11,7 +11,7 @@
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ==========================================================================


@@ -22,7 +22,7 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sckipc.h"
 #endif
 
 #pragma implementation "sckipc.h"
 #endif
 


@@ -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

-#if defined(__UNIX__) && !defined(__WXMAC__)
+#if defined(__UNIX__) && !defined(__WXMAC__) && !defined(__WINE__)

     // 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 )


@@ -125,6 +125,7 @@ public:
   void Server_OnRequest(wxSocketEvent& event);
 
   DECLARE_EVENT_TABLE()
   void Server_OnRequest(wxSocketEvent& event);
 
   DECLARE_EVENT_TABLE()

+  DECLARE_NO_COPY_CLASS(wxTCPEventHandler)

 };
 
 enum
 };
 
 enum


@@ -530,7 +531,6 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
   if (!connection)
     return;
 
   if (!connection)
     return;
 

-  int msg = 0;

   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
   wxSocketStream *sockstrm;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
   wxSocketStream *sockstrm;


@@ -550,7 +550,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
   codeci = connection->m_codeci;
   codeco = connection->m_codeco;
   sockstrm = connection->m_sockstrm;
   codeci = connection->m_codeci;
   codeco = connection->m_codeco;
   sockstrm = connection->m_sockstrm;

-  msg = codeci->Read8();
+  int msg = codeci->Read8();

 
   switch (msg)
   {
 
   switch (msg)
   {


@@ -743,7 +743,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)
 // wxTCPEventHandlerModule (private class)
 // --------------------------------------------------------------------------
 
 // wxTCPEventHandlerModule (private class)
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTCPEventHandlerModule: public wxModule
+class wxTCPEventHandlerModule: public wxModule

 {
   DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)
 
 {
   DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)