Alexandre Julliard : wininet: Include ws2tcpip. h before anything else for the Windows build.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Dec  9 11:33:25 2008 +0100

wininet: Include ws2tcpip.h before anything else for the Windows build.

---

 dlls/wininet/cookie.c        |    4 ++++
 dlls/wininet/dialogs.c       |    4 ++++
 dlls/wininet/ftp.c           |    4 ++++
 dlls/wininet/http.c          |    4 ++++
 dlls/wininet/internet.c      |    4 ++++
 dlls/wininet/internet.h      |    1 -
 dlls/wininet/netconnection.c |    4 ++++
 dlls/wininet/urlcache.c      |   14 +++++++++++---
 dlls/wininet/utility.c       |    4 ++++
 9 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 12d841b..1ee8809 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -23,6 +23,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index dd5aa31..41494a6 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -21,6 +21,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <stdarg.h>
 
 #include "windef.h"
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 396f1ef..7dcbeb3 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -30,6 +30,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 4a9954b..2b9b95f 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -29,6 +29,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 5dbbc48..94ff541 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -31,6 +31,10 @@
 
 #define MAXHOSTNAME 100 /* from http.c */
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index bb694e9..d8da781 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -43,7 +43,6 @@
 #endif
 
 #if defined(__MINGW32__) || defined (_MSC_VER)
-#include "ws2tcpip.h"
 #ifndef MSG_WAITALL
 #define MSG_WAITALL 0
 #endif
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index e688a51..d8bdf45 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -23,6 +23,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_POLL_H
 #include <poll.h>
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index fe3bc5b..d1d54ae 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -25,15 +25,23 @@
 #include "config.h"
 #include "wine/port.h"
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <time.h>
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index ff914f4..b68cf8d 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -25,6 +25,10 @@
 #include "config.h"
 #include "wine/port.h"
 
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#endif
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>