Use winsock2.h, use ws2tcpip.h for socklen_t

src/iodine.c

@@ -28,7 +28,7 @@
 
 #ifdef WINDOWS32
 #include "windows.h"
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <arpa/nameser.h>
 #ifdef DARWIN

src/iodined.c

@@ -29,7 +29,7 @@
 
 #ifdef WINDOWS32
 #include "windows.h"
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <arpa/nameser.h>
 #ifdef DARWIN

src/osflags

@@ -20,7 +20,7 @@ link)
 	;;
 cflags)
 	case $1 in
-		BeOS | windows32)
+		BeOS)
 			echo '-Dsocklen_t=int';
 		;;
 	esac

src/tun.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 
 #ifdef WINDOWS32
-#include <winsock.h>
+#include <winsock2.h>
 #include <winioctl.h>
 #include "windows.h"
 

src/user.c

@@ -25,7 +25,7 @@
 #include <fcntl.h>
 
 #ifdef WINDOWS32
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <err.h>
 #include <arpa/inet.h>

src/windows.h

@@ -22,6 +22,7 @@ typedef unsigned int in_addr_t;
 #include <windows.h>
 #include <windns.h>
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <iphlpapi.h>
 
 #define T_A DNS_TYPE_A