Include the size of any window borders (size vs. clientsize

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

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index d7bb9362d30833b9dbde588d237e21223ab0a43a..aeed5804a5a1ddbfdd19a24d989445e246cfb927 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -101,6 +101,9 @@ int _System soclose(int);
 #ifdef sgi
 #  include <bstring.h>
 #endif
 #ifdef sgi
 #  include <bstring.h>
 #endif

+#ifdef _AIX
+#  include <strings.h>
+#endif

 #include <signal.h>
 
 #ifndef SOCKLEN_T
 #include <signal.h>
 
 #ifndef SOCKLEN_T


@@ -117,14 +120,22 @@ int _System soclose(int);
 #  endif
 #endif
 
 #  endif
 #endif
 

-#else
-   /* undefine for OSX - its really an int */
-#  ifdef __DARWIN__
-#    undef SOCKLEN_T
-#    define SOCKLEN_T int
-#  endif

 #endif /* SOCKLEN_T */
 
 #endif /* SOCKLEN_T */
 

+#ifndef SOCKOPTLEN_T
+#define SOCKOPTLEN_T SOCKLEN_T
+#endif
+
+/*
+ * OSX 10.2 has int args instead of SOCKLENXXX_T
+ */
+#if defined( __WXMAC__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
+#undef SOCKOPTLEN_T 
+#undef SOCKLEN_T
+#define SOCKOPTLEN_T int
+#define SOCKLEN_T int
+#endif
+

 /*
  * MSW defines this, Unices don't.
  */
 /*
  * MSW defines this, Unices don't.
  */


@@ -582,7 +593,6 @@ GSocket *GSocket::WaitConnection()
   err = _GAddress_translate_from(connection->m_peer, &from, fromlen);
   if (err != GSOCK_NOERROR)
   {
   err = _GAddress_translate_from(connection->m_peer, &from, fromlen);
   if (err != GSOCK_NOERROR)
   {

-    GAddress_destroy(connection->m_peer);

     delete connection;
     m_error = err;
     return NULL;
     delete connection;
     m_error = err;
     return NULL;


@@ -698,9 +708,9 @@ GSocketError GSocket::Connect(GSocketStream stream)
       else
       {
         int error;
       else
       {
         int error;

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

 
 

-        getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
+        getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len);

 
         if (!error)
           return GSOCK_NOERROR;
 
         if (!error)
           return GSOCK_NOERROR;


@@ -983,11 +993,11 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
       if (m_establishing && !m_server)
       {
         int error;
       if (m_establishing && !m_server)
       {
         int error;

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

 
         m_establishing = false;
 
 
         m_establishing = false;
 

-        getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+        getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);

 
         if (error)
         {
 
         if (error)
         {


@@ -1138,7 +1148,7 @@ void GSocket::UnsetCallback(GSocketEventFlags flags)
 GSocketError GSocket::GetSockOpt(int level, int optname,
                                 void *optval, int *optlen)
 {
 GSocketError GSocket::GetSockOpt(int level, int optname,
                                 void *optval, int *optlen)
 {

-    if (getsockopt(m_fd, level, optname, optval, (SOCKLEN_T*)optlen) == 0)
+    if (getsockopt(m_fd, level, optname, (char*)optval, (SOCKOPTLEN_T*)optlen) == 0)

     {
         return GSOCK_NOERROR;
     }
     {
         return GSOCK_NOERROR;
     }


@@ -1148,7 +1158,7 @@ GSocketError GSocket::GetSockOpt(int level, int optname,
 GSocketError GSocket::SetSockOpt(int level, int optname,
                                 const void *optval, int optlen)
 {
 GSocketError GSocket::SetSockOpt(int level, int optname,
                                 const void *optval, int optlen)
 {

-    if (setsockopt(m_fd, level, optname, optval, optlen) == 0)
+    if (setsockopt(m_fd, level, optname, (const char*)optval, optlen) == 0)

     {
         return GSOCK_NOERROR;
     }
     {
         return GSOCK_NOERROR;
     }


@@ -1405,11 +1415,11 @@ void GSocket::Detected_Write()
   if (m_establishing && !m_server)
   {
     int error;
   if (m_establishing && !m_server)
   {
     int error;

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

 
     m_establishing = false;
 
 
     m_establishing = false;
 

-    getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+    getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);

 
     if (error)
     {
 
     if (error)
     {