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

[Dmitry Timoshkov]

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(a)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

[André Hentschel]

On 28.02.19 18:37, Dmitry Timoshkov wrote:
> 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(a)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"

While I can't see that problem with the newest official libpcap (1.9.0) 
the patch is required with libpcap git 
09d8f281ce569a14878f249fd47168f29980be21
Would have been helpful to mention that

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>