Merge branch 'next' of git@gitorious.org:fg/simgear into next

[simgear.git] / simgear / io / raw_socket.cxx

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