(main) [_WIN32]: Upgrade to winsock version 2.

Remove version 1.1 include files.

src/client/expect.c

@@ -42,8 +42,6 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <unistd.h>
-#else
-#include <winsock.h>
 #endif
 
 int

src/client/host.c

@@ -49,7 +49,6 @@
 #include <unistd.h>
 #else
 #include <io.h>
-#include <winsock.h>
 #endif
 #include "misc.h"
 

src/client/main.c

@@ -56,7 +56,6 @@
 #include <unistd.h>
 #else
 #include <windows.h>
-#include <winsock.h>
 #include <conio.h>
 #include <io.h>
 #endif
@@ -78,6 +77,7 @@ int
 main(int ac, char **av)
 {
 #ifdef _WIN32
+    WORD wVersionRequested;
     WSADATA WsaData;
     int err;
     fd_set readfds;
@@ -117,9 +117,10 @@ main(int ac, char **av)
      * after each prompt is required.
      */
     setvbuf(stdout, NULL, _IOLBF, 4096);
-    err = WSAStartup(0x0101, &WsaData);
+    wVersionRequested = MAKEWORD(2, 0);
-    if (err == SOCKET_ERROR) {
+    err = WSAStartup(wVersionRequested, &WsaData);
-	printf("WSAStartup Failed\n");
+    if (err != 0) {
+	printf("WSAStartup Failed, error code %d\n", err);
 	return FALSE;
     }
 #else

src/client/misc.h

@@ -39,7 +39,6 @@
 #include <sys/types.h>
 #ifdef _WIN32
 #include <windows.h>
-#include <winsock.h>
 #else
 #include <netinet/in.h>
 #endif

src/client/serverio.c

@@ -43,7 +43,6 @@
 #if !defined(_WIN32)
 #include <unistd.h>
 #else
-#include <winsock.h>
 #include <io.h>
 #endif
 

src/client/termio.c

@@ -40,7 +40,6 @@
 #ifndef _WIN32
 #include <unistd.h>
 #else
-#include <winsock.h>
 #include <io.h>
 #endif /* _WIN32 */
 #include "misc.h"