Miscellaneous fixes to try to make other compilers happier

[u/mdw/putty] / telnet.c

diff --git a/telnet.c b/telnet.c
index 75435c6..4fb39c6 100644 (file)
--- a/telnet.c
+++ b/telnet.c
@@ -1,7 +1,13 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
 #include <winsock.h>
+#endif
+#endif
 
 #include "putty.h"
 
@@ -583,6 +589,12 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) {
      * Set up SYNCH state.
      */
     in_synch = FALSE;
+
+    /*
+     * We have no pre-session phase.
+     */
+    begin_session();
+
     return NULL;
 }
 
@@ -749,5 +761,6 @@ Backend telnet_backend = {
     telnet_size,
     telnet_special,
     telnet_socket,
-    telnet_sendok
+    telnet_sendok,
+    23
 };