[PATCH] wpcap: Fix compilation with recent pcap/pcap.h versions.

Dmitry Timoshkov dmitry at baikal.ru
Thu Feb 28 11:37:47 CST 2019


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 at baikal.ru>
---
 dlls/wpcap/wpcap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index e7908cd038..f163235138 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -24,6 +24,7 @@
 #undef SOCKET
 #undef INVALID_SOCKET
 
+#define USE_WS_PREFIX
 #include "winsock2.h"
 #include "windef.h"
 #include "winbase.h"
-- 
2.20.1




More information about the wine-devel mailing list