Marged chris/win32/merge/07-win32-fixes at r210 to trunk

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/server/SocketStream.h b/lib/server/SocketStream.h
index 9b16dbfc..5caaacfd 100755
--- a/lib/server/SocketStream.h
+++ b/lib/server/SocketStream.h
@@ -12,6 +12,12 @@
 
 #include "IOStream.h"
 
+#ifdef WIN32
+	typedef SOCKET tOSSocketHandle;
+#else
+	typedef int tOSSocketHandle;
+#endif
+
 // --------------------------------------------------------------------------
 //
 // Class
@@ -42,12 +48,12 @@ public:
 	virtual bool GetPeerCredentials(uid_t &rUidOut, gid_t &rGidOut);
 
 protected:
-	int GetSocketHandle();
+	tOSSocketHandle GetSocketHandle();
 	void MarkAsReadClosed() {mReadClosed = true;}
 	void MarkAsWriteClosed() {mWriteClosed = true;}
 
 private:
-	int mSocketHandle;
+	tOSSocketHandle mSocketHandle;
 	bool mReadClosed;
 	bool mWriteClosed;
 };