[Box Backup-commit] COMMIT r3423 - box/trunk/lib/server

subversion at boxbackup.org subversion at boxbackup.org
Sun Nov 16 23:12:27 GMT 2014


Author: chris
Date: 2014-11-16 23:12:27 +0000 (Sun, 16 Nov 2014)
New Revision: 3423

Modified:
   box/trunk/lib/server/Daemon.cpp
   box/trunk/lib/server/WinNamedPipeStream.cpp
   box/trunk/lib/server/WinNamedPipeStream.h
Log:
Fix compile errors on Windows, thanks to Kai Liebenau for the patch.

Modified: box/trunk/lib/server/Daemon.cpp
===================================================================
--- box/trunk/lib/server/Daemon.cpp	2014-11-16 23:12:22 UTC (rev 3422)
+++ box/trunk/lib/server/Daemon.cpp	2014-11-16 23:12:27 UTC (rev 3423)
@@ -24,6 +24,7 @@
 #endif
 
 #ifdef WIN32
+	#include <Strsafe.h>
 	#include <ws2tcpip.h>
 	#include <process.h>
 #endif

Modified: box/trunk/lib/server/WinNamedPipeStream.cpp
===================================================================
--- box/trunk/lib/server/WinNamedPipeStream.cpp	2014-11-16 23:12:22 UTC (rev 3422)
+++ box/trunk/lib/server/WinNamedPipeStream.cpp	2014-11-16 23:12:27 UTC (rev 3423)
@@ -91,7 +91,7 @@
 				GetErrorMessage(err));
 			Close();
 			THROW_EXCEPTION(ConnectionException, 
-				Conn_SocketReadError)
+				SocketReadError)
 		}
 	}
 }
@@ -334,7 +334,7 @@
 
 					Close();
 					THROW_EXCEPTION(ConnectionException, 
-						Conn_SocketReadError)
+						SocketReadError)
 				}
 			}
 		}
@@ -394,7 +394,7 @@
 					<< GetErrorMessage(err));
 				Close();
 				THROW_EXCEPTION(ConnectionException, 
-					Conn_SocketReadError)
+					SocketReadError)
 			}
 		}
 	}
@@ -424,7 +424,7 @@
 				BOX_ERROR("Failed to read from control socket: "
 					<< GetErrorMessage(err));
 				THROW_EXCEPTION(ConnectionException, 
-					Conn_SocketReadError)
+					SocketReadError)
 			}
 		}
 		
@@ -486,7 +486,7 @@
 			Close();
 
 			THROW_EXCEPTION(ConnectionException, 
-				Conn_SocketWriteError)
+				SocketWriteError)
 		}
 
 		NumBytesWrittenTotal += NumBytesWrittenThisTime;

Modified: box/trunk/lib/server/WinNamedPipeStream.h
===================================================================
--- box/trunk/lib/server/WinNamedPipeStream.h	2014-11-16 23:12:22 UTC (rev 3422)
+++ box/trunk/lib/server/WinNamedPipeStream.h	2014-11-16 23:12:27 UTC (rev 3423)
@@ -36,7 +36,8 @@
 	// both sides
 	virtual int Read(void *pBuffer, int NBytes, 
 		int Timeout = IOStream::TimeOutInfinite);
-	virtual void Write(const void *pBuffer, int NBytes);
+	virtual void Write(const void *pBuffer, int NBytes,
+		int Timeout = IOStream::TimeOutInfinite);
 	virtual void WriteAllBuffered();
 	virtual void Close();
 	virtual bool StreamDataLeft();




More information about the Boxbackup-commit mailing list