2 files changed, 28 insertions, 9 deletions

diff --git a/src/tcpsocket.cpp b/src/tcpsocket.cpp
index 399ec44..b9b215c 100644
--- a/src/tcpsocket.cpp
+++ b/src/tcpsocket.cpp
@@ -31,7 +31,7 @@
 
 namespace Bu { subExceptionDef( TcpSocketException ) }
 
-Bu::TcpSocket::TcpSocket( int nTcpSocket ) :
+Bu::TcpSocket::TcpSocket( handle nTcpSocket ) :
         nTcpSocket( nTcpSocket ),
         bActive( true ),
         bBlocking( true )
@@ -443,11 +443,24 @@ Bu::String Bu::TcpSocket::getAddress() const
         return sAddress;
 }
 
-Bu::TcpSocket::operator int() const
+Bu::TcpSocket::operator Bu::TcpSocket::handle() const
 {
         return nTcpSocket;
 }
 
+Bu::TcpSocket::handle Bu::TcpSocket::getHandle() const
+{
+        return nTcpSocket;
+}
+
+Bu::TcpSocket::handle Bu::TcpSocket::takeHandle()
+{
+        handle nRet = nTcpSocket;
+        bActive = false;
+        nTcpSocket = 0;
+        return nRet;
+}
+
 Bu::size Bu::TcpSocket::getSize() const
 {
         throw UnsupportedException();
diff --git a/src/tcpsocket.h b/src/tcpsocket.h
index dbaaa5e..52218bd 100644
--- a/src/tcpsocket.h
+++ b/src/tcpsocket.h
@@ -60,7 +60,13 @@ namespace Bu
         class TcpSocket : public Stream
         {
         public:
-                TcpSocket( int nTcpSocket );
+#ifdef WIN32
+                typedef unsigned int handle;
+#else
+                typedef int handle;
+#endif
+
+                TcpSocket( handle nTcpSocket );
                 TcpSocket( const String &sAddr, int nPort, int nTimeout=30,
                                 bool bBlocking=true );
                 virtual ~TcpSocket();
@@ -96,7 +102,10 @@ namespace Bu
                 virtual void setSize( size iSize );
 
                 Bu::String getAddress() const;
-                operator int() const;
+                operator handle() const;
+
+                handle getHandle() const;
+                handle takeHandle();
 
                 virtual size getSize() const;
                 virtual size getBlockSize() const;
@@ -105,11 +114,8 @@ namespace Bu
         private:
                 void setAddress();
 
-#ifdef WIN32
-                unsigned int nTcpSocket;
-#else
-                int nTcpSocket;
-#endif
+                handle nTcpSocket;
+                
                 bool bActive;
                 bool bBlocking;
                 String sReadBuf;