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

Remove version 1.1 include files.

diff --git a/src/client/expect.c b/src/client/expect.c
index 2cd4da25f0ef85065baae9f3c774f0810e37f849..b25107fbb5e8cdc729052c52a32b0cb1137c9c81 100644 (file)
--- a/src/client/expect.c
+++ b/src/client/expect.c
@@ -42,8 +42,6 @@
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <unistd.h>
-#else
-#include <winsock.h>
 #endif
 
 int

diff --git a/src/client/host.c b/src/client/host.c
index a27de0940666e999d3298840ab9040cbc9812f19..7b5b077fbe2ad83385ed5082e461c27bf9b300cc 100644 (file)
--- a/src/client/host.c
+++ b/src/client/host.c
@@ -49,7 +49,6 @@
 #include <unistd.h>
 #else
 #include <io.h>
-#include <winsock.h>
 #endif
 #include "misc.h"
 

diff --git a/src/client/main.c b/src/client/main.c
index 11ed0aff4fed7a5e45dc5c190ab43c8e342586ae..2a95bbafa1fc57479b9b3a0f76cd835a9e7e1245 100644 (file)
--- a/src/client/main.c
+++ b/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);
-    if (err == SOCKET_ERROR) {
-       printf("WSAStartup Failed\n");
+    wVersionRequested = MAKEWORD(2, 0);
+    err = WSAStartup(wVersionRequested, &WsaData);
+    if (err != 0) {
+       printf("WSAStartup Failed, error code %d\n", err);
        return FALSE;
     }
 #else

diff --git a/src/client/misc.h b/src/client/misc.h
index 58e3dd6d8654fc194034789bc87e0fed59e081e3..295b3d91a83ab4e1e9459d6d31f1c653f579b0a7 100644 (file)
--- a/src/client/misc.h
+++ b/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

diff --git a/src/client/serverio.c b/src/client/serverio.c
index 2ba34cbfd04ee5c469cf05152dfaabb0315c0c41..9741413b6525b58b922bb34ac55449414d27500e 100644 (file)
--- a/src/client/serverio.c
+++ b/src/client/serverio.c
@@ -43,7 +43,6 @@
 #if !defined(_WIN32)
 #include <unistd.h>
 #else
-#include <winsock.h>
 #include <io.h>
 #endif
 

diff --git a/src/client/termio.c b/src/client/termio.c
index 6586f200b0175ce536347ed7539f44ba707ed599..aad6051f6b7807f6bcb9296c821358acc5521c81 100644 (file)
--- a/src/client/termio.c
+++ b/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"