[Box Backup-commit] COMMIT r1894 - box/trunk/lib/server
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Wed Oct 17 13:55:46 BST 2007
Author: chris
Date: 2007-10-17 13:55:46 +0100 (Wed, 17 Oct 2007)
New Revision: 1894
Modified:
box/trunk/lib/server/SocketStream.cpp
Log:
Compile fix for MSVC (Gary) (merges [1861])
Modified: box/trunk/lib/server/SocketStream.cpp
===================================================================
--- box/trunk/lib/server/SocketStream.cpp 2007-10-17 12:55:24 UTC (rev 1893)
+++ box/trunk/lib/server/SocketStream.cpp 2007-10-17 12:55:46 UTC (rev 1894)
@@ -168,14 +168,17 @@
::close(mSocketHandle);
#endif
+#ifdef WIN32
BOX_ERROR("Failed to connect to socket (type " << Type <<
", name " << Name << ", port " << Port << "): " <<
- #ifdef WIN32
GetErrorMessage(err)
- #else
+ );
+#else
+ BOX_ERROR("Failed to connect to socket (type " << Type <<
+ ", name " << Name << ", port " << Port << "): " <<
strerror(err) << " (" << err << ")"
- #endif
);
+#endif
mSocketHandle = INVALID_SOCKET_VALUE;
THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
More information about the Boxbackup-commit
mailing list