Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.

Alexandre Julliard julliard at winehq.org
Fri Aug 23 09:31:27 CDT 2019


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

Author: Vijay Kiran Kamuju <infyquest at gmail.com>
Date:   Fri May  3 18:49:48 2019 +0200

wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.

Signed-off-by: Vijay Kiran Kamuju <infyquest at gmail.com>
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 660399b8fd905a208f192781723f7fe881b132fe)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

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

diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index f163235..6450a0e 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un
     return pcap_next_ex(p, pkt_header, pkt_data);
 }
 
+#ifndef PCAP_OPENFLAG_PROMISCUOUS
 #define PCAP_OPENFLAG_PROMISCUOUS 1
+#endif
 
 pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout,
                              void *auth, char *errbuf)




More information about the wine-cvs mailing list