ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Fix compile with MinGW.

This commit is contained in:
Rob Shearman 2008-03-03 21:46:52 +00:00 committed by Alexandre Julliard
parent dc484a9b93
commit 0aec3fcf86
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/wininet/internet.h
View File

@ -55,12 +55,13 @@
#endif
#if defined(__MINGW32__) || defined (_MSC_VER)
#include "winsock2.h"
#include "ws2tcpip.h"
#ifndef MSG_WAITALL
#define MSG_WAITALL 0
#endif
#else
#define closesocket close
#define ioctlsocket ioctl
#endif /* __MINGW32__ */
/* used for netconnection.c stuff */

11
dlls/wininet/netconnection.c
View File

@ -49,14 +49,14 @@
#include "winerror.h"
#include "wincrypt.h"
#include "wine/debug.h"
#include "internet.h"
/* To avoid conflicts with the Unix socket headers. we only need it for
* the error codes anyway. */
#define USE_WS_PREFIX
#include "winsock2.h"
#include "wine/debug.h"
#include "internet.h"
#define RESPONSE_TIMEOUT 30 /* FROM internet.c */
@ -203,6 +203,7 @@ BOOL NETCON_connected(WININET_NETCONNECTION *connection)
/* translate a unix error code into a winsock one */
static int sock_get_error( int err )
{
#if !defined(__MINGW32__) && !defined (_MSC_VER)
switch (err)
{
case EINTR: return WSAEINTR;
@ -262,6 +263,8 @@ static int sock_get_error( int err )
#endif
default: errno=err; perror("sock_set_error"); return WSAEFAULT;
}
#endif
return err;
}
/******************************************************************************
@ -584,7 +587,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail
if (!connection->useSSL)
{
int unread;
int retval = ioctl(connection->socketFD, FIONREAD, &unread);
int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread);
if (!retval)
{
TRACE("%d bytes of queued, but unread data\n", unread);