=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: wpcap: Fix build with newer pcap versions.

Alexandre Julliard julliard at winehq.org
Fri Oct 20 07:19:57 CDT 2017


Module: wine
Branch: stable
Commit: 773cad9f16ecc9aaf751e05cdf2f6f408c582305
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=773cad9f16ecc9aaf751e05cdf2f6f408c582305

Author: André Hentschel <nerv at dawncrow.de>
Date:   Fri Jul 21 15:16:51 2017 +0200

wpcap: Fix build with newer pcap versions.

Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 28173f06932edd85a64a952120d29b9bb1e762ea)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

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

diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index b770067..fe46903 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -19,6 +19,11 @@
  */
 
 #include <pcap/pcap.h>
+
+/* pcap.h might define those: */
+#undef SOCKET
+#undef INVALID_SOCKET
+
 #include "winsock2.h"
 #include "windef.h"
 #include "winbase.h"




More information about the wine-cvs mailing list