wxSocket compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index df34996012728eb06d49c1b7718944943d79226d..b06e2490fbcb384664fe134830edd61ad2b79a65 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -916,7 +916,7 @@ class WXDLLEXPORT wxSocketModule: public wxModule {
     return TRUE;
   }
   void OnExit() {
     return TRUE;
   }
   void OnExit() {

-    GSocket_Done();
+    GSocket_Cleanup();

   }
 };
 
   }
 };
 

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 594c772a26018bb6696699735e1c48e26e9ecb56..c4b51b9aa5904fef76833abf25126a1c8fdbd883 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -34,10 +34,10 @@
 #endif
 
 #include <signal.h>
 #endif
 
 #include <signal.h>

-//#include <features.h>
+/* #include <features.h> */

 
 

-#include <wx/setup.h>
-#include <wx/gsocket.h>
+#include "wx/setup.h"
+#include "wx/gsocket.h"

 #include "gsockunx.h"
 
 #ifndef SOCKLEN_T
 #include "gsockunx.h"
 
 #ifndef SOCKLEN_T


@@ -62,10 +62,6 @@ void GSocket_Cleanup()
 {
 }
 
 {
 }
 

-void GSocket_Done()
-{
-}
-

 /* Constructors / Destructors */
 
 GSocket *GSocket_new()
 /* Constructors / Destructors */
 
 GSocket *GSocket_new()


@@ -570,7 +566,9 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;

-  int fromlen, ret;
+  
+  SOCKLEN_T fromlen;
+  int ret;

 
   fromlen = sizeof(from);
 
 
   fromlen = sizeof(from);
 


@@ -740,8 +738,9 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len)
     break;
 #endif
   default:
     break;
 #endif
   default:

-
+    {

     /* TODO error */
     /* TODO error */

+    }

   }
 
   if (address->m_addr)
   }
 
   if (address->m_addr)