1945421 applied

[wxWidgets.git] / src / mac / carbon / gsocket.cpp

diff --git a/src/mac/carbon/gsocket.cpp b/src/mac/carbon/gsocket.cpp
index bf85902ca2d44ecdc07539c9f854e50ea7442a77..123d9cd6b5f8affde95bf862975f97b2e95ab36f 100644 (file)
--- a/src/mac/carbon/gsocket.cpp
+++ b/src/mac/carbon/gsocket.cpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------------------
  * Project:     GSocket (Generic Socket) for WX
 /* -------------------------------------------------------------------------
  * Project:     GSocket (Generic Socket) for WX

- * Name:        gsocket.cpp
+ * Name:        src/mac/carbon/gsocket.cpp

  * Copyright:   (c) Guilhem Lavaux
  * Licence:     wxWindows Licence
  * Authors:     Guilhem Lavaux,
  * Copyright:   (c) Guilhem Lavaux
  * Licence:     wxWindows Licence
  * Authors:     Guilhem Lavaux,


@@ -16,7 +16,6 @@
  */
 
 #ifndef __GSOCKET_STANDALONE__
  */
 
 #ifndef __GSOCKET_STANDALONE__

-#include "wx/setup.h"

 #include "wx/platform.h"
 #endif
 
 #include "wx/platform.h"
 #endif
 


@@ -195,19 +194,11 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 */
 }
 
 */
 }
 

-/* Global initialisers */
-
-void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *table)
-{
-    // do nothing, wxMac doesn't have wxBase-GUI separation yet
-}
-
-int GSocket_Init()
+bool GSocket_Init()

 {
 {

-    return 1;
+    return true;

 }
 
 }
 

-bool GSocket_Verify_Inited() ;

 bool GSocket_Verify_Inited()
 {
     OSStatus err ;
 bool GSocket_Verify_Inited()
 {
     OSStatus err ;


@@ -513,7 +504,7 @@ GSocketError GSocket::SetServer()
   if ((bind(m_endpoint, m_local->m_addr, m_local->m_len) != 0) ||
       (getsockname(m_endpoint,
                    m_local->m_addr,
   if ((bind(m_endpoint, m_local->m_addr, m_local->m_len) != 0) ||
       (getsockname(m_endpoint,
                    m_local->m_addr,

-                   (SOCKLEN_T *) &m_local->m_len) != 0) ||
+                   (WX_SOCKLEN_T *) &m_local->m_len) != 0) ||

       (listen(m_endpoint, 5) != 0))
   {
     close(m_endpoint);
       (listen(m_endpoint, 5) != 0))
   {
     close(m_endpoint);


@@ -572,7 +563,7 @@ GSocket *GSocket::WaitConnection()
 
 // TODO
 #if 0
 
 // TODO
 #if 0

-  connection->m_endpoint = accept(m_endpoint, &from, (SOCKLEN_T *) &fromlen);
+  connection->m_endpoint = accept(m_endpoint, &from, (WX_SOCKLEN_T *) &fromlen);

 #endif
 
   if (connection->m_endpoint == kOTInvalidEndpointRef )
 #endif
 
   if (connection->m_endpoint == kOTInvalidEndpointRef )


@@ -678,7 +669,7 @@ GSocketError GSocket::SetNonOriented()
   if ((bind(m_endpoint, m_local->m_addr, m_local->m_len) != 0) ||
       (getsockname(m_endpoint,
                    m_local->m_addr,
   if ((bind(m_endpoint, m_local->m_addr, m_local->m_len) != 0) ||
       (getsockname(m_endpoint,
                    m_local->m_addr,

-                   (SOCKLEN_T *) &m_local->m_len) != 0))
+                   (WX_SOCKLEN_T *) &m_local->m_len) != 0))

   {
     close(m_endpoint);
     m_endpoint    = -1;
   {
     close(m_endpoint);
     m_endpoint    = -1;


@@ -795,7 +786,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
       {
 /*
         int error;
       {
 /*
         int error;

-        SOCKLEN_T len = sizeof(error);
+        WX_SOCKLEN_T len = sizeof(error);

 
         getsockopt(m_endpoint, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
 
 
         getsockopt(m_endpoint, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
 


@@ -1093,12 +1084,12 @@ int GSocket::Recv_Dgram(char *buffer, int size)
   int ret = -1;
 #if 0
   struct sockaddr from;
   int ret = -1;
 #if 0
   struct sockaddr from;

-  SOCKLEN_T fromlen = sizeof(from);
+  WX_SOCKLEN_T fromlen = sizeof(from);

   GSocketError err;
 
   fromlen = sizeof(from);
 
   GSocketError err;
 
   fromlen = sizeof(from);
 

-  ret = recvfrom(m_endpoint, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+  ret = recvfrom(m_endpoint, buffer, size, 0, &from, (WX_SOCKLEN_T *) &fromlen);

 
   if (ret == -1)
     return -1;
 
   if (ret == -1)
     return -1;


@@ -1315,6 +1306,11 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

+GSocketError GAddress_INET_SetBroadcastAddress(GAddress *address)
+{
+  return GAddress_INET_SetHostAddress(address, INADDR_BROADCAST);
+}
+

 GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
 {
   return GAddress_INET_SetHostAddress(address, INADDR_ANY);
 GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
 {
   return GAddress_INET_SetHostAddress(address, INADDR_ANY);