From de73d25e0b27f4bee2de116d19cab32800785d64 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 2 Oct 2015 14:56:07 +0200
Subject: 7.2

---
 zen/win.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'zen/win.h')

diff --git a/zen/win.h b/zen/win.h
index 121e6a9c..13ecf4e4 100644
--- a/zen/win.h
+++ b/zen/win.h
@@ -7,6 +7,10 @@
 #ifndef YAWFWH_YET_ANOTHER_WRAPPER_FOR_WINDOWS_H
 #define YAWFWH_YET_ANOTHER_WRAPPER_FOR_WINDOWS_H
 
+#ifndef _WINSOCKAPI_ //prevent inclusion of winsock.h in windows.h: obsoleted by and conflicting with winsock2.h
+    #define _WINSOCKAPI_
+#endif
+
 //------------------------------------------------------
 #ifdef __WXMSW__ //we have wxWidgets
     #include <wx/msw/wrapwin.h> //includes "windows.h"
-- 
cgit