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

Cast 4th parameter of getsockopt to char* and of setsockopt to const char*

Browse Source 
so that older headers such as those found on Solaris 2.6 will work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-11-09 04:20:38 +00:00
parent 9e9c7a1525
commit f71bb8efc3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/unix/gsocket.cpp
View File

@@ -700,7 +700,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
int error; int error;
SOCKLEN_T len = sizeof(error); SOCKLEN_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) if (!error)
return GSOCK_NOERROR; return GSOCK_NOERROR;
@@ -987,7 +987,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
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 +1138,7 @@ void GSocket::UnsetCallback(GSocketEventFlags flags)
GSocketError GSocket::GetSockOpt(int level, int optname, GSocketError GSocket::GetSockOpt(int level, int optname,
void *optval, int *optlen) void *optval, int *optlen)
{ {
if (getsockopt(m_fd, level, optname, optval, (SOCKLEN_T*)optlen) == 0) if (getsockopt(m_fd, level, optname, (char*)optval, (SOCKLEN_T*)optlen) == 0)
{ {
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
@@ -1148,7 +1148,7 @@ GSocketError GSocket::GetSockOpt(int level, int optname,
GSocketError GSocket::SetSockOpt(int level, int optname, GSocketError GSocket::SetSockOpt(int level, int optname,
const void *optval, int optlen) 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;
} }
@@ -1409,7 +1409,7 @@ void GSocket::Detected_Write()
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)
{ {