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

Some platforms that use socklen_t don't use it for the fifth argument to

Browse Source 
getsockopt.  Do a separate test and define SOCKOPTLEN_T appropriately.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-12-28 03:17:50 +00:00
parent c81dc3db6b
commit ddc1a35fc9
2 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/unix/gsocket.cpp
View File

@@ -117,14 +117,12 @@ int _System soclose(int);
# endif
#endif
#else
/* undefine for OSX - its really an int */
# ifdef __DARWIN__
# undef SOCKLEN_T
# define SOCKLEN_T int
# endif
#endif /* SOCKLEN_T */
#ifndef SOCKOPTLEN_T
#define SOCKOPTLEN_T SOCKLEN_T
#endif
/*
* MSW defines this, Unices don't.
*/
@@ -698,7 +696,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
else
{
int error;
SOCKLEN_T len = sizeof(error);
SOCKOPTLEN_T len = sizeof(error);
getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len);
@@ -983,7 +981,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
if (m_establishing && !m_server)
{
int error;
SOCKLEN_T len = sizeof(error);
SOCKOPTLEN_T len = sizeof(error);
m_establishing = false;
@@ -1138,7 +1136,7 @@ void GSocket::UnsetCallback(GSocketEventFlags flags)
GSocketError GSocket::GetSockOpt(int level, int optname,
void *optval, int *optlen)
{
if (getsockopt(m_fd, level, optname, (char*)optval, (SOCKLEN_T*)optlen) == 0)
if (getsockopt(m_fd, level, optname, (char*)optval, (SOCKOPTLEN_T*)optlen) == 0)
{
return GSOCK_NOERROR;
}
@@ -1405,7 +1403,7 @@ void GSocket::Detected_Write()
if (m_establishing && !m_server)
{
int error;
SOCKLEN_T len = sizeof(error);
SOCKOPTLEN_T len = sizeof(error);
m_establishing = false;