Fixes for new telnet client

svn path=/trunk/; revision=2463

diff --git a/rosapps/net/telnet/src/stl_bids.h b/rosapps/net/telnet/src/stl_bids.h
index 28d65b3..6e34711 100644 (file)
--- a/rosapps/net/telnet/src/stl_bids.h
+++ b/rosapps/net/telnet/src/stl_bids.h
@@ -130,11 +130,11 @@ public:
                _Last = _First;
 #else
                destroy(begin( ), end( ));
                _Last = _First;
 #else
                destroy(begin( ), end( ));

-//#ifdef __CYGWIN__
-//             _M_finish = _M_start;
-//#else
-//             finish = start;
-//#endif
+#ifdef __CYGWIN__
+               _M_finish = _M_start;
+#else
+               finish = start;
+#endif

 #endif
        }
        
 #endif
        }
        

diff --git a/rosapps/net/telnet/src/tnetwork.h b/rosapps/net/telnet/src/tnetwork.h
index 6615938..527945f 100644 (file)
--- a/rosapps/net/telnet/src/tnetwork.h
+++ b/rosapps/net/telnet/src/tnetwork.h
@@ -7,15 +7,15 @@
 #include <windows.h>
 
 // Mingw32 doesn't use winsock.h (Paul Brannan 9/4/98)
 #include <windows.h>
 
 // Mingw32 doesn't use winsock.h (Paul Brannan 9/4/98)

-//#ifdef __MINGW32__
-//#ifdef __CYGWIN__
+#ifdef __MINGW32__
+#ifdef __CYGWIN__

 #include <winsock.h>
 #include <winsock.h>

-//#else
-//#include <Windows32/sockets.h>
-//#endif
-//#else
-//#include <winsock.h>
-//#endif
+#else
+#include <Windows32/sockets.h>
+#endif
+#else
+#include <winsock.h>
+#endif

 
 enum NetworkType {TN_NETSOCKET, TN_NETPIPE};
 
 
 enum NetworkType {TN_NETSOCKET, TN_NETPIPE};