Jacek Caban : wininet: Don't include ws2tcpip.h after zlib.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6a0eb2ddd764ee61f1717211f26744ea751f1712
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6a0eb2ddd764ee61f1717211f26744ea751f1712

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Feb 16 11:17:08 2015 +0100

wininet: Don't include ws2tcpip.h after zlib.h.

---

 dlls/wininet/http.c     | 4 ++--
 dlls/wininet/internet.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index b878cab..d515d7d 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -30,11 +30,11 @@
 #include "config.h"
 
 #ifdef HAVE_ZLIB
-#  define Z_SOLO
 #  include <zlib.h>
 #endif
 
-#include "ws2tcpip.h"
+#include "winsock2.h"
+#include "ws2ipdef.h"
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 2ad414f..e0baf2a 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -37,7 +37,7 @@ typedef struct {
     INTERNET_PORT port;
     BOOL is_https;
     struct sockaddr_storage addr;
-    socklen_t addr_len;
+    int addr_len;
     char addr_str[INET6_ADDRSTRLEN];
 
     WCHAR *scheme_host_port;