Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorporated src/unix/gsocket.c 1.86 to 1.92 changes (except 1.90 to 1.91

Browse Source 
which was applied by Vadim as 1.9 to 1.10 of src/unix/gsocket.cpp)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-07-27 02:15:32 +00:00
parent 2d080a4963
commit b082b52407
2 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/unix/gsockunx.h
View File

@@ -44,6 +44,7 @@ public:
GAddress *GetPeer();
GSocketError SetServer();
GSocket *WaitConnection();
int SetReusable();
GSocketError Connect(GSocketStream stream);
GSocketError SetNonOriented();
int Read(char *buffer, int size);
@@ -55,6 +56,9 @@ public:
void SetCallback(GSocketEventFlags flags,
GSocketCallback callback, char *cdata);
void UnsetCallback(GSocketEventFlags flags);
GSocketError GetSockOpt(int level, int optname, void *optval, int *optlen);
GSocketError SetSockOpt(int level, int optname,
const void *optval, int optlen);
/* API compatibility functions */
static void _GSocket_Detected_Read(GSocket *socket);
static void _GSocket_Detected_Write(GSocket *socket);
@@ -172,6 +176,8 @@ inline GSocketError GSocket_SetServer(GSocket *socket)
{ return socket->SetServer(); }
inline GSocket *GSocket_WaitConnection(GSocket *socket)
{ return socket->WaitConnection(); }
inline int GSocket_SetReusable(GSocket *socket)
{ return socket->SetReusable(); }
inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
{ return socket->Connect(stream); }
inline GSocketError GSocket_SetNonOriented(GSocket *socket)
@@ -191,6 +197,12 @@ inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
{ socket->SetCallback(flags,fallback,cdata); }
inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ socket->UnsetCallback(flags); }
inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
void *optval, int *optlen)
{ return socket->GetSockOpt(level,optname,optval,optlen); }
inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen)
{ return socket->SetSockOpt(level,optname,optval,optlen); }
#endif /* def wxUSE_GSOCKET_CPLUSPLUS */