Fixing compilation on Mac, and attempting to better calculate the bottom position...

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

diff --git a/src/mac/carbon/gsocket.cpp b/src/mac/carbon/gsocket.cpp
index bf85902ca2d44ecdc07539c9f854e50ea7442a77..04441b27dfcc8bde2a0729e679b302dd4b194dcd 100644 (file)
--- a/src/mac/carbon/gsocket.cpp
+++ b/src/mac/carbon/gsocket.cpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------------------
  * 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,
@@ -16,7 +16,6 @@
  */
 
 #ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
 #include "wx/platform.h"
 #endif
 
@@ -513,7 +512,7 @@ GSocketError GSocket::SetServer()
   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);
@@ -572,7 +571,7 @@ GSocket *GSocket::WaitConnection()
 
 // 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 )
@@ -678,7 +677,7 @@ GSocketError GSocket::SetNonOriented()
   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;
@@ -795,7 +794,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
       {
 /*
         int error;
-        SOCKLEN_T len = sizeof(error);
+        WX_SOCKLEN_T len = sizeof(error);
 
         getsockopt(m_endpoint, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
 
@@ -1093,12 +1092,12 @@ int GSocket::Recv_Dgram(char *buffer, int size)
   int ret = -1;
 #if 0
   struct sockaddr from;
-  SOCKLEN_T fromlen = sizeof(from);
+  WX_SOCKLEN_T 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;