diff options
author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
---|---|---|
committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /lib/server/SocketStream.h | |
parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/server/SocketStream.h')
-rwxr-xr-x | lib/server/SocketStream.h | 10 |
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; }; |