compilation fix for PCH-less compilation after the last change

[wxWidgets.git] / src / msw / gsocket.cpp

diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index f71724d2649e75795fd3d95f3e3ca7c79b3cec12..8cc501a98ecf917a8cabb42a2dbaa29591ee69a4 100644 (file)
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -53,24 +53,16 @@
 
 #include <winsock.h>
 
 
 #include <winsock.h>
 

-#ifndef __GSOCKET_STANDALONE__
-#   include "wx/platform.h"
-#endif
+#include "wx/platform.h"

 
 

-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+#if wxUSE_SOCKETS

 
 

-#ifndef __GSOCKET_STANDALONE__
-#  include "wx/msw/gsockmsw.h"
-#  include "wx/gsocket.h"
-#else
-#  include "gsockmsw.h"
-#  include "gsocket.h"
-#endif /* __GSOCKET_STANDALONE__ */
+#include "wx/gsocket.h"
+#include "wx/link.h"

 
 

-#ifndef __WXWINCE__
-#include <assert.h>
-#else
-#define assert(x)
+wxFORCE_LINK_MODULE(gsockmsw)
+
+#ifdef __WXWINCE__

 #ifndef isdigit
 #define isdigit(x) (x > 47 && x < 58)
 #endif
 #ifndef isdigit
 #define isdigit(x) (x > 47 && x < 58)
 #endif


@@ -94,69 +86,23 @@ typedef struct sockaddr_storage wxSockAddr;
 typedef struct sockaddr wxSockAddr;
 #endif
 
 typedef struct sockaddr wxSockAddr;
 #endif
 

-
-/* Table of GUI-related functions. We must call them indirectly because
- * of wxBase and GUI separation: */
-
-static GSocketGUIFunctionsTable *gs_gui_functions;
-
-class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
-{
-public:
-    virtual bool OnInit();
-    virtual void OnExit();
-    virtual bool CanUseEventLoop();
-    virtual bool Init_Socket(GSocket *socket);
-    virtual void Destroy_Socket(GSocket *socket);
-    virtual void Enable_Events(GSocket *socket);
-    virtual void Disable_Events(GSocket *socket);
-};
-
-bool GSocketGUIFunctionsTableNull::OnInit()
-{   return true; }
-void GSocketGUIFunctionsTableNull::OnExit()
-{}
-bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
-{   return false; }
-bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket))
-{   return true; }
-void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket))
-{}
-void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket))
-{}
-void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))
-{}
-/* Global initialisers */
-
-void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
-{
-  gs_gui_functions = guifunc;
-}
-
-int GSocket_Init(void)
+bool GSocket_Init()

 {
   WSADATA wsaData;
 
 {
   WSADATA wsaData;
 

-  if (!gs_gui_functions)
-  {
-    static GSocketGUIFunctionsTableNull table;
-    gs_gui_functions = &table;
-  }
-  if ( !gs_gui_functions->OnInit() )
-  {
-    return 0;
-  }
+  GSocketManager * const manager = GSocketManager::Get();
+  if ( !manager || !manager->OnInit() )
+      return false;

 
   /* Initialize WinSocket */
 
   /* Initialize WinSocket */

-  return (WSAStartup((1 << 8) | 1, &wsaData) == 0);
+  return WSAStartup((1 << 8) | 1, &wsaData) == 0;

 }
 
 }
 

-void GSocket_Cleanup(void)
+void GSocket_Cleanup()

 {
 {

-  if (gs_gui_functions)
-  {
-      gs_gui_functions->OnExit();
-  }
+  GSocketManager * const manager = GSocketManager::Get();
+  if ( manager )
+    manager->OnExit();

 
   /* Cleanup WinSocket */
   WSACleanup();
 
   /* Cleanup WinSocket */
   WSACleanup();


@@ -184,29 +130,24 @@ GSocket::GSocket()
   m_timeout.tv_usec = 0;
   m_establishing    = false;
   m_reusable        = false;
   m_timeout.tv_usec = 0;
   m_establishing    = false;
   m_reusable        = false;

-  m_broadcast          = false;
+  m_broadcast       = false;

   m_dobind          = true;
   m_initialRecvBufferSize = -1;
   m_initialSendBufferSize = -1;
 
   m_dobind          = true;
   m_initialRecvBufferSize = -1;
   m_initialSendBufferSize = -1;
 

-  assert(gs_gui_functions);
-  /* Per-socket GUI-specific initialization */
-  m_ok = gs_gui_functions->Init_Socket(this);
+  m_ok = GSocketManager::Get()->Init_Socket(this);

 }
 
 void GSocket::Close()
 {
 }
 
 void GSocket::Close()
 {

-    gs_gui_functions->Disable_Events(this);
+    GSocketManager::Get()->Disable_Events(this);

     closesocket(m_fd);
     m_fd = INVALID_SOCKET;
 }
 
 GSocket::~GSocket()
 {
     closesocket(m_fd);
     m_fd = INVALID_SOCKET;
 }
 
 GSocket::~GSocket()
 {

-  assert(this);
-
-  /* Per-socket GUI-specific cleanup */
-  gs_gui_functions->Destroy_Socket(this);
+  GSocketManager::Get()->Destroy_Socket(this);

 
   /* Check that the socket is really shutdowned */
   if (m_fd != INVALID_SOCKET)
 
   /* Check that the socket is really shutdowned */
   if (m_fd != INVALID_SOCKET)


@@ -228,8 +169,6 @@ void GSocket::Shutdown()
 {
   int evt;
 
 {
   int evt;
 

-  assert(this);
-

   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {


@@ -262,8 +201,6 @@ void GSocket::Shutdown()
  */
 GSocketError GSocket::SetLocal(GAddress *address)
 {
  */
 GSocketError GSocket::SetLocal(GAddress *address)
 {

-  assert(this);
-

   /* the socket must be initialized, or it must be a server */
   if (m_fd != INVALID_SOCKET && !m_server)
   {
   /* the socket must be initialized, or it must be a server */
   if (m_fd != INVALID_SOCKET && !m_server)
   {


@@ -288,8 +225,6 @@ GSocketError GSocket::SetLocal(GAddress *address)
 
 GSocketError GSocket::SetPeer(GAddress *address)
 {
 
 GSocketError GSocket::SetPeer(GAddress *address)
 {

-  assert(this);
-

   /* check address */
   if (address == NULL || address->m_family == GSOCK_NOFAMILY)
   {
   /* check address */
   if (address == NULL || address->m_family == GSOCK_NOFAMILY)
   {


@@ -312,8 +247,6 @@ GAddress *GSocket::GetLocal()
   WX_SOCKLEN_T size = sizeof(addr);
   GSocketError err;
 
   WX_SOCKLEN_T size = sizeof(addr);
   GSocketError err;
 

-  assert(this);
-

   /* try to get it from the m_local var first */
   if (m_local)
     return GAddress_copy(m_local);
   /* try to get it from the m_local var first */
   if (m_local)
     return GAddress_copy(m_local);


@@ -350,8 +283,6 @@ GAddress *GSocket::GetLocal()
 
 GAddress *GSocket::GetPeer()
 {
 
 GAddress *GSocket::GetPeer()
 {

-  assert(this);
-

   /* try to get it from the m_peer var */
   if (m_peer)
     return GAddress_copy(m_peer);
   /* try to get it from the m_peer var */
   if (m_peer)
     return GAddress_copy(m_peer);


@@ -375,8 +306,6 @@ GSocketError GSocket::SetServer()
 {
   u_long arg = 1;
 
 {
   u_long arg = 1;
 

-  assert(this);
-

   /* must not be in use */
   if (m_fd != INVALID_SOCKET)
   {
   /* must not be in use */
   if (m_fd != INVALID_SOCKET)
   {


@@ -405,7 +334,7 @@ GSocketError GSocket::SetServer()
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);

-  gs_gui_functions->Enable_Events(this);
+  GSocketManager::Get()->Enable_Events(this);

 
   /* allow a socket to re-bind if the socket is in the TIME_WAIT
      state after being previously closed.
 
   /* allow a socket to re-bind if the socket is in the TIME_WAIT
      state after being previously closed.


@@ -453,8 +382,6 @@ GSocket *GSocket::WaitConnection()
   GSocketError err;
   u_long arg = 1;
 
   GSocketError err;
   u_long arg = 1;
 

-  assert(this);
-

   /* Reenable CONNECTION events */
   m_detected &= ~GSOCK_CONNECTION_FLAG;
 
   /* Reenable CONNECTION events */
   m_detected &= ~GSOCK_CONNECTION_FLAG;
 


@@ -517,7 +444,7 @@ GSocket *GSocket::WaitConnection()
   }
 
   ioctlsocket(connection->m_fd, FIONBIO, (u_long FAR *) &arg);
   }
 
   ioctlsocket(connection->m_fd, FIONBIO, (u_long FAR *) &arg);

-  gs_gui_functions->Enable_Events(connection);
+  GSocketManager::Get()->Enable_Events(connection);

 
   return connection;
 }
 
   return connection;
 }


@@ -598,8 +525,6 @@ GSocketError GSocket::Connect(GSocketStream stream)
   int ret, err;
   u_long arg = 1;
 
   int ret, err;
   u_long arg = 1;
 

-  assert(this);
-

   /* Enable CONNECTION events (needed for nonblocking connections) */
   m_detected &= ~GSOCK_CONNECTION_FLAG;
 
   /* Enable CONNECTION events (needed for nonblocking connections) */
   m_detected &= ~GSOCK_CONNECTION_FLAG;
 


@@ -631,7 +556,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);

-  gs_gui_functions->Enable_Events(this);
+  GSocketManager::Get()->Enable_Events(this);

 
   // If the reuse flag is set, use the applicable socket reuse flag
   if (m_reusable)
 
   // If the reuse flag is set, use the applicable socket reuse flag
   if (m_reusable)


@@ -716,8 +641,6 @@ GSocketError GSocket::SetNonOriented()
 {
   u_long arg = 1;
 
 {
   u_long arg = 1;
 

-  assert(this);
-

   if (m_fd != INVALID_SOCKET)
   {
     m_error = GSOCK_INVSOCK;
   if (m_fd != INVALID_SOCKET)
   {
     m_error = GSOCK_INVSOCK;


@@ -744,7 +667,7 @@ GSocketError GSocket::SetNonOriented()
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
   }
 
   ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);

-  gs_gui_functions->Enable_Events(this);
+  GSocketManager::Get()->Enable_Events(this);

 
   if (m_reusable)
   {
 
   if (m_reusable)
   {


@@ -780,8 +703,6 @@ int GSocket::Read(char *buffer, int size)
 {
   int ret;
 
 {
   int ret;
 

-  assert(this);
-

   /* Reenable INPUT events */
   m_detected &= ~GSOCK_INPUT_FLAG;
 
   /* Reenable INPUT events */
   m_detected &= ~GSOCK_INPUT_FLAG;
 


@@ -820,8 +741,6 @@ int GSocket::Write(const char *buffer, int size)
 {
   int ret;
 
 {
   int ret;
 

-  assert(this);
-

   if (m_fd == INVALID_SOCKET || m_server)
   {
     m_error = GSOCK_INVSOCK;
   if (m_fd == INVALID_SOCKET || m_server)
   {
     m_error = GSOCK_INVSOCK;


@@ -866,107 +785,7 @@ int GSocket::Write(const char *buffer, int size)
  */
 GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
 {
  */
 GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
 {

-  if (!gs_gui_functions->CanUseEventLoop())
-  {
-    GSocketEventFlags result = 0;
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-
-    assert(this);
-
-    FD_ZERO(&readfds);
-    FD_ZERO(&writefds);
-    FD_ZERO(&exceptfds);
-    FD_SET(m_fd, &readfds);
-    if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
-      FD_SET(m_fd, &writefds);
-    FD_SET(m_fd, &exceptfds);
-
-    /* Check 'sticky' CONNECTION flag first */
-    result |= (GSOCK_CONNECTION_FLAG & m_detected);
-
-    /* If we have already detected a LOST event, then don't try
-     * to do any further processing.
-     */
-    if ((m_detected & GSOCK_LOST_FLAG) != 0)
-    {
-      m_establishing = false;
-
-      return (GSOCK_LOST_FLAG & flags);
-    }
-
-    /* Try select now */
-    if (select(m_fd + 1, &readfds, &writefds, &exceptfds,
-        &m_timeout) <= 0)
-    {
-      /* What to do here? */
-      return (result & flags);
-    }
-
-    /* Check for exceptions and errors */
-    if (FD_ISSET(m_fd, &exceptfds))
-    {
-      m_establishing = false;
-      m_detected = GSOCK_LOST_FLAG;
-
-      /* LOST event: Abort any further processing */
-      return (GSOCK_LOST_FLAG & flags);
-    }
-
-    /* Check for readability */
-    if (FD_ISSET(m_fd, &readfds))
-    {
-      result |= GSOCK_INPUT_FLAG;
-
-      if (m_server && m_stream)
-      {
-        /* This is a TCP server socket that detected a connection.
-           While the INPUT_FLAG is also set, it doesn't matter on
-           this kind of  sockets, as we can only Accept() from them. */
-        result |= GSOCK_CONNECTION_FLAG;
-        m_detected |= GSOCK_CONNECTION_FLAG;
-      }
-    }
-
-    /* Check for writability */
-    if (FD_ISSET(m_fd, &writefds))
-    {
-      if (m_establishing && !m_server)
-      {
-        int error;
-        WX_SOCKLEN_T len = sizeof(error);
-
-        m_establishing = false;
-
-        getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
-
-        if (error)
-        {
-          m_detected = GSOCK_LOST_FLAG;
-
-          /* LOST event: Abort any further processing */
-          return (GSOCK_LOST_FLAG & flags);
-        }
-        else
-        {
-          result |= GSOCK_CONNECTION_FLAG;
-          m_detected |= GSOCK_CONNECTION_FLAG;
-        }
-      }
-      else
-      {
-        result |= GSOCK_OUTPUT_FLAG;
-      }
-    }
-
-    return (result & flags);
-  }
-  else /* USE_GUI() */
-  {
-    assert(this);
-    return flags & m_detected;
-  }
+  return flags & m_detected;

 }
 
 /* Attributes */
 }
 
 /* Attributes */


@@ -977,8 +796,6 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
  */
 void GSocket::SetNonBlocking(bool non_block)
 {
  */
 void GSocket::SetNonBlocking(bool non_block)
 {

-  assert(this);
-

   m_non_blocking = non_block;
 }
 
   m_non_blocking = non_block;
 }
 


@@ -988,8 +805,6 @@ void GSocket::SetNonBlocking(bool non_block)
  */
 void GSocket::SetTimeout(unsigned long millis)
 {
  */
 void GSocket::SetTimeout(unsigned long millis)
 {

-  assert(this);
-

   m_timeout.tv_sec  = (millis / 1000);
   m_timeout.tv_usec = (millis % 1000) * 1000;
 }
   m_timeout.tv_sec  = (millis / 1000);
   m_timeout.tv_usec = (millis % 1000) * 1000;
 }


@@ -1001,8 +816,6 @@ void GSocket::SetTimeout(unsigned long millis)
  */
 GSocketError WXDLLIMPEXP_NET GSocket::GetError()
 {
  */
 GSocketError WXDLLIMPEXP_NET GSocket::GetError()
 {

-  assert(this);
-

   return m_error;
 }
 
   return m_error;
 }
 


@@ -1041,8 +854,6 @@ void GSocket::SetCallback(GSocketEventFlags flags,
 {
   int count;
 
 {
   int count;
 

-  assert(this);
-

   for (count = 0; count < GSOCK_MAX_EVENT; count++)
   {
     if ((flags & (1 << count)) != 0)
   for (count = 0; count < GSOCK_MAX_EVENT; count++)
   {
     if ((flags & (1 << count)) != 0)


@@ -1061,8 +872,6 @@ void GSocket::UnsetCallback(GSocketEventFlags flags)
 {
   int count;
 
 {
   int count;
 

-  assert(this);
-

   for (count = 0; count < GSOCK_MAX_EVENT; count++)
   {
     if ((flags & (1 << count)) != 0)
   for (count = 0; count < GSOCK_MAX_EVENT; count++)
   {
     if ((flags & (1 << count)) != 0)


@@ -1236,7 +1045,7 @@ int GSocket::Send_Dgram(const char *buffer, int size)
 }
 
 /* Compatibility functions for GSocket */
 }
 
 /* Compatibility functions for GSocket */

-GSocket *GSocket_new(void)
+GSocket *GSocket_new()

 {
     GSocket *newsocket = new GSocket();
     if(newsocket->IsOk())
 {
     GSocket *newsocket = new GSocket();
     if(newsocket->IsOk())


@@ -1284,7 +1093,7 @@ GSocket *GSocket_new(void)
 }
 
 
 }
 
 

-GAddress *GAddress_new(void)
+GAddress *GAddress_new()

 {
   GAddress *address;
 
 {
   GAddress *address;
 


@@ -1302,8 +1111,6 @@ GAddress *GAddress_copy(GAddress *address)
 {
   GAddress *addr2;
 
 {
   GAddress *addr2;
 

-  assert(address != NULL);
-

   if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL)
     return NULL;
 
   if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL)
     return NULL;
 


@@ -1325,8 +1132,6 @@ GAddress *GAddress_copy(GAddress *address)
 
 void GAddress_destroy(GAddress *address)
 {
 
 void GAddress_destroy(GAddress *address)
 {

-  assert(address != NULL);
-

   if (address->m_addr)
     free(address->m_addr);
 
   if (address->m_addr)
     free(address->m_addr);
 


@@ -1335,15 +1140,11 @@ void GAddress_destroy(GAddress *address)
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)
 {
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)
 {

-  assert(address != NULL);
-

   address->m_family = type;
 }
 
 GAddressType GAddress_GetFamily(GAddress *address)
 {
   address->m_family = type;
 }
 
 GAddressType GAddress_GetFamily(GAddress *address)
 {

-  assert(address != NULL);
-

   return address->m_family;
 }
 
   return address->m_family;
 }
 


@@ -1437,8 +1238,6 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   struct hostent *he;
   struct in_addr *addr;
 
   struct hostent *he;
   struct in_addr *addr;
 

-  assert(address != NULL);
-

   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);


@@ -1478,8 +1277,6 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 {
   struct in_addr *addr;
 
 {
   struct in_addr *addr;
 

-  assert(address != NULL);
-

   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);


@@ -1494,7 +1291,6 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   struct servent *se;
   struct sockaddr_in *addr;
 
   struct servent *se;
   struct sockaddr_in *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET);
 
   if (!port)
   CHECK_ADDRESS(address, INET);
 
   if (!port)


@@ -1530,7 +1326,6 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;


@@ -1545,7 +1340,6 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   char *addr_buf;
   struct sockaddr_in *addr;
 
   char *addr_buf;
   struct sockaddr_in *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;


@@ -1567,7 +1361,6 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
   CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;


@@ -1579,7 +1372,6 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
   CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;


@@ -1621,7 +1413,6 @@ GSocketError _GAddress_Init_INET6(GAddress *address)
 
 GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
 {
 
 GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
 {

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET6);
 
   addrinfo hints;
   CHECK_ADDRESS(address, INET6);
 
   addrinfo hints;


@@ -1641,8 +1432,6 @@ GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
 
 GSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
 {
 
 GSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
 {

-  assert(address != NULL);
-

   CHECK_ADDRESS(address, INET6);
 
   struct in6_addr addr;
   CHECK_ADDRESS(address, INET6);
 
   struct in6_addr addr;


@@ -1652,8 +1441,6 @@ GSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
 GSocketError GAddress_INET6_SetHostAddress(GAddress *address,
                                           struct in6_addr hostaddr)
 {
 GSocketError GAddress_INET6_SetHostAddress(GAddress *address,
                                           struct in6_addr hostaddr)
 {

-  assert(address != NULL);
-

   CHECK_ADDRESS(address, INET6);
 
   ((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr;
   CHECK_ADDRESS(address, INET6);
 
   ((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr;


@@ -1667,7 +1454,6 @@ GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
   struct servent *se;
   struct sockaddr_in6 *addr;
 
   struct servent *se;
   struct sockaddr_in6 *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET6);
 
   if (!port)
   CHECK_ADDRESS(address, INET6);
 
   if (!port)


@@ -1679,7 +1465,7 @@ GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
   se = getservbyname(port, protocol);
   if (!se)
   {
   se = getservbyname(port, protocol);
   if (!se)
   {

-    if (isdigit(port[0]))
+    if (isdigit((unsigned char) port[0]))

     {
       int port_int;
 
     {
       int port_int;
 


@@ -1703,7 +1489,6 @@ GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port)
 {
   struct sockaddr_in6 *addr;
 
 {
   struct sockaddr_in6 *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET6);
 
   addr = (struct sockaddr_in6 *)address->m_addr;
   CHECK_ADDRESS(address, INET6);
 
   addr = (struct sockaddr_in6 *)address->m_addr;


@@ -1718,7 +1503,6 @@ GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_
   char *addr_buf;
   struct sockaddr_in6 *addr;
 
   char *addr_buf;
   struct sockaddr_in6 *addr;
 

-  assert(address != NULL);

   CHECK_ADDRESS(address, INET6);
 
   addr = (struct sockaddr_in6 *)address->m_addr;
   CHECK_ADDRESS(address, INET6);
 
   addr = (struct sockaddr_in6 *)address->m_addr;


@@ -1738,8 +1522,6 @@ GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_
 
 GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr)
 {
 
 GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr)
 {

-  assert(address != NULL);
-  assert(hostaddr != NULL);

   CHECK_ADDRESS_RETVAL(address, INET6, GSOCK_INVADDR);
   *hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr;
   return GSOCK_NOERROR;
   CHECK_ADDRESS_RETVAL(address, INET6, GSOCK_INVADDR);
   *hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr;
   return GSOCK_NOERROR;


@@ -1747,7 +1529,6 @@ GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *ho
 
 unsigned short GAddress_INET6_GetPort(GAddress *address)
 {
 
 unsigned short GAddress_INET6_GetPort(GAddress *address)
 {

-  assert(address != NULL);

   CHECK_ADDRESS_RETVAL(address, INET6, 0);
 
   return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port );
   CHECK_ADDRESS_RETVAL(address, INET6, 0);
 
   return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port );


@@ -1763,31 +1544,20 @@ unsigned short GAddress_INET6_GetPort(GAddress *address)
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {

-  assert (address != NULL);

   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path))
 {
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path))
 {

-  assert (address != NULL);

   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf))
 {
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf))
 {

-  assert (address != NULL);

   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 

-#else /* !wxUSE_SOCKETS */
-
-/*
- * Translation unit shouldn't be empty, so include this typedef to make the
- * compiler (VC++ 6.0, for example) happy
- */
-typedef void (*wxDummy)();
-
-#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+#endif  // wxUSE_SOCKETS