diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-11-16 23:12:27 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-11-16 23:12:27 +0000 |
| commit | 21413fad9f0f0987f486652cb31c1f0f45a71fb6 (patch) | |
| tree | fb6a39cd9ab8663ba82f9239fb4e76e6578972bf /lib | |
| parent | 34aede1c187c06ad94076bb7947f879bae2889ce (diff) | |
Fix compile errors on Windows, thanks to Kai Liebenau for the patch.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/server/Daemon.cpp | 1 | ||||
| -rw-r--r-- | lib/server/WinNamedPipeStream.cpp | 10 | ||||
| -rw-r--r-- | lib/server/WinNamedPipeStream.h | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 31a641e0..521787f8 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -24,6 +24,7 @@ #endif #ifdef WIN32 + #include <Strsafe.h> #include <ws2tcpip.h> #include <process.h> #endif diff --git a/lib/server/WinNamedPipeStream.cpp b/lib/server/WinNamedPipeStream.cpp index 52ad9743..9d33ec86 100644 --- a/lib/server/WinNamedPipeStream.cpp +++ b/lib/server/WinNamedPipeStream.cpp @@ -91,7 +91,7 @@ WinNamedPipeStream::WinNamedPipeStream(HANDLE hNamedPipe) GetErrorMessage(err)); Close(); THROW_EXCEPTION(ConnectionException, - Conn_SocketReadError) + SocketReadError) } } } @@ -334,7 +334,7 @@ int WinNamedPipeStream::Read(void *pBuffer, int NBytes, int Timeout) Close(); THROW_EXCEPTION(ConnectionException, - Conn_SocketReadError) + SocketReadError) } } } @@ -394,7 +394,7 @@ int WinNamedPipeStream::Read(void *pBuffer, int NBytes, int Timeout) << GetErrorMessage(err)); Close(); THROW_EXCEPTION(ConnectionException, - Conn_SocketReadError) + SocketReadError) } } } @@ -424,7 +424,7 @@ int WinNamedPipeStream::Read(void *pBuffer, int NBytes, int Timeout) BOX_ERROR("Failed to read from control socket: " << GetErrorMessage(err)); THROW_EXCEPTION(ConnectionException, - Conn_SocketReadError) + SocketReadError) } } @@ -486,7 +486,7 @@ void WinNamedPipeStream::Write(const void *pBuffer, int NBytes) Close(); THROW_EXCEPTION(ConnectionException, - Conn_SocketWriteError) + SocketWriteError) } NumBytesWrittenTotal += NumBytesWrittenThisTime; diff --git a/lib/server/WinNamedPipeStream.h b/lib/server/WinNamedPipeStream.h index 386ff7e3..37eda40d 100644 --- a/lib/server/WinNamedPipeStream.h +++ b/lib/server/WinNamedPipeStream.h @@ -36,7 +36,8 @@ public: // 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(); |