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

Alexandre Julliard julliard at winehq.org
Wed May 15 14:32:22 CDT 2019


Module: wine
Branch: stable
Commit: 2a532f4809fc0328877c1f8219609c526daaba8b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2a532f4809fc0328877c1f8219609c526daaba8b

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Thu Feb 28 20:37:47 2019 +0300

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 at baikal.ru>
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 40c9b46500c3606e966d5404d45b68a48609b6ea)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/wpcap/wpcap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index e7908cd..f163235 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"




More information about the wine-cvs mailing list