system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

winhttp: Fix compilation with MinGW/MSVC.

Browse source
This commit is contained in:
Rob Shearman 2008-10-01 11:20:31 +01:00 committed by Alexandre Julliard
parent d82e36fa4a
commit a14d34b2f6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/winhttp/net.c
View file

@ -50,12 +50,12 @@
#include "winhttp.h"
#include "wincrypt.h"
#include "winhttp_private.h"
/* to avoid conflicts with the Unix socket headers */
#define USE_WS_PREFIX
#include "winsock2.h"
#include "winhttp_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
#define DEFAULT_SEND_TIMEOUT 30
@ -115,6 +115,7 @@ MAKE_FUNCPTR( ERR_error_string );
/* translate a unix error code into a winsock error code */
static int sock_get_error( int err )
{
#if !defined(__MINGW32__) && !defined (_MSC_VER)
switch (err)
{
case EINTR: return WSAEINTR;
@ -174,6 +175,7 @@ static int sock_get_error( int err )
#endif
default: errno = err; perror( "sock_set_error" ); return WSAEFAULT;
}
#endif
return err;
}
@ -282,7 +284,7 @@ BOOL netconn_close( netconn_t *conn )
conn->secure = FALSE;
}
#endif
res = close( conn->socket );
res = closesocket( conn->socket );
conn->socket = -1;
if (res == -1)
{
@ -464,7 +466,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
return TRUE;
}
#ifdef FIONREAD
if (!(ret = ioctl( conn->socket, FIONREAD, &unread ))) *available = unread;
if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread;
#endif
return TRUE;
}

6
dlls/winhttp/winhttp_private.h
View file

@ -34,6 +34,12 @@
#endif
#if defined(__MINGW32__) || defined (_MSC_VER)
# include <ws2tcpip.h>
# ifndef MSG_WAITALL
# define MSG_WAITALL 0
# endif
#else
# define closesocket close
# define ioctlsocket ioctl
#endif
static const WCHAR getW[] = {'G','E','T',0};