diff --git a/socketft.cpp b/socketft.cpp index f9b5bd66..fcf56f44 100644 --- a/socketft.cpp +++ b/socketft.cpp @@ -356,7 +356,7 @@ void Socket::HandleError(const char *operation) const #ifdef USE_WINDOWS_STYLE_SOCKETS SocketReceiver::SocketReceiver(Socket &s) - : m_s(s), m_eofReceived(false), m_resultPending(false) + : m_s(s), m_lastResult(0), m_resultPending(false), m_eofReceived(false) { m_event.AttachHandle(CreateEvent(NULL, true, false, NULL), true); m_s.CheckAndHandleError("CreateEvent", m_event.HandleValid()); @@ -538,7 +538,7 @@ unsigned int SocketSender::GetSendResult() #ifdef USE_BERKELEY_STYLE_SOCKETS SocketReceiver::SocketReceiver(Socket &s) - : m_s(s), m_eofReceived(false), m_lastResult(0) + : m_s(s), m_lastResult(0), m_eofReceived(false) { } diff --git a/socketft.h b/socketft.h index 825680d0..360cc4b6 100644 --- a/socketft.h +++ b/socketft.h @@ -144,16 +144,17 @@ public: private: Socket &m_s; - bool m_eofReceived; #ifdef USE_WINDOWS_STYLE_SOCKETS WindowsHandle m_event; OVERLAPPED m_overlapped; - bool m_resultPending; DWORD m_lastResult; + bool m_resultPending; #else unsigned int m_lastResult; #endif + + bool m_eofReceived; }; class SocketSender : public NetworkSender @@ -181,8 +182,8 @@ private: #ifdef USE_WINDOWS_STYLE_SOCKETS WindowsHandle m_event; OVERLAPPED m_overlapped; - bool m_resultPending; DWORD m_lastResult; + bool m_resultPending; #else unsigned int m_lastResult; #endif