From ca17eff36b7084f213ab3c233b6183ef8bd1a345 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 27 Jul 1999 13:25:16 +0000 Subject: [PATCH 1/1] wxSocket compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/socket.cpp | 2 +- src/unix/gsocket.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/common/socket.cpp b/src/common/socket.cpp index df34996012..b06e2490fb 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -916,7 +916,7 @@ class WXDLLEXPORT wxSocketModule: public wxModule { return TRUE; } void OnExit() { - GSocket_Done(); + GSocket_Cleanup(); } }; diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 594c772a26..c4b51b9aa5 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -34,10 +34,10 @@ #endif #include -//#include +/* #include */ -#include -#include +#include "wx/setup.h" +#include "wx/gsocket.h" #include "gsockunx.h" #ifndef SOCKLEN_T @@ -62,10 +62,6 @@ void GSocket_Cleanup() { } -void GSocket_Done() -{ -} - /* 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 fromlen, ret; + + SOCKLEN_T fromlen; + int ret; fromlen = sizeof(from); @@ -740,8 +738,9 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len) break; #endif default: - + { /* TODO error */ + } } if (address->m_addr) -- 2.45.2