FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Win32 compilation of raw_socket.

Browse Source
This commit is contained in:
James Turner 2010-07-23 06:30:02 +01:00
parent c37b27a926
commit 293d3b4fb3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
simgear/io/raw_socket.cxx
View File

@ -331,7 +331,7 @@ bool Socket::isNonBlockingError ()
if ( wsa_errno != 0 ) if ( wsa_errno != 0 )
{ {
WSASetLastError(0); WSASetLastError(0);
ulSetError(UL_WARNING,"WSAGetLastError() => %d",wsa_errno); SG_LOG(SG_IO, SG_WARN, "isNonBlockingError: WSAGetLastError():" << wsa_errno);
switch (wsa_errno) { switch (wsa_errno) {
case WSAEWOULDBLOCK: // always == NET_EAGAIN? case WSAEWOULDBLOCK: // always == NET_EAGAIN?
case WSAEALREADY: case WSAEALREADY:
@ -474,8 +474,7 @@ int Socket::initSockets()
WSADATA wsaData; WSADATA wsaData;
if ( WSAStartup(version_wanted, &wsaData) != 0 ) { if ( WSAStartup(version_wanted, &wsaData) != 0 ) {
ulSetError(UL_WARNING,"Couldn't initialize Winsock 1.1"); throw sg_exception("WinSock initialization failed");
return(-1);
} }
#endif #endif