marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wpcap: Fix compilation with recent pcap/pcap.h versions. 

Recent libpcap versions have added inclusion of pcap/socket.h
to pcap.h that includes sys/socket.h and other system .h files
that lead to conflicts with winsock2.h.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 40c9b46500)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Dmitry Timoshkov 2019-02-28 20:37:47 +03:00 committed by Michael Stefaniuc
parent ea33e9e51b
commit 2a532f4809
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wpcap/wpcap.c
View File

@ -24,6 +24,7 @@
#undef SOCKET
#undef INVALID_SOCKET
#define USE_WS_PREFIX
#include "winsock2.h"
#include "windef.h"
#include "winbase.h"