Jacek Caban : wininet: Include config.h in internet.c for Mac configure macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed May 18 10:51:11 CDT 2016
Module: wine
Branch: master
Commit: 7d541b3fd3531e9edb334780f9ff3093fed6fd1b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d541b3fd3531e9edb334780f9ff3093fed6fd1b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 17 19:15:49 2016 +0200
wininet: Include config.h in internet.c for Mac configure macros.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wininet/internet.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index f7e974a..371c3d0 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -26,15 +26,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-
-#include "ws2tcpip.h"
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <assert.h>
+#include "config.h"
#ifdef HAVE_CORESERVICES_CORESERVICES_H
#define GetCurrentThread MacGetCurrentThread
@@ -45,6 +37,16 @@
#undef DPRINTF
#endif
+#include "winsock2.h"
+#include "ws2ipdef.h"
+
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <assert.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
@@ -3370,7 +3372,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe
if (dwFlags & FLAG_ICC_FORCE_CONNECTION)
{
struct sockaddr_storage saddr;
- socklen_t sa_len = sizeof(saddr);
+ int sa_len = sizeof(saddr);
WCHAR *host_z;
int fd;
BOOL b;
More information about the wine-cvs
mailing list