summaryrefslogtreecommitdiff
path: root/zen/win.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2015-10-02 14:56:07 +0200
committerDaniel Wilhelm <daniel@wili.li>2015-10-02 14:56:07 +0200
commitde73d25e0b27f4bee2de116d19cab32800785d64 (patch)
tree21de1736d12a92223ad04c02a5b0826d77e5e71c /zen/win.h
parent7.1 (diff)
downloadFreeFileSync-de73d25e0b27f4bee2de116d19cab32800785d64.tar.gz
FreeFileSync-de73d25e0b27f4bee2de116d19cab32800785d64.tar.bz2
FreeFileSync-de73d25e0b27f4bee2de116d19cab32800785d64.zip
7.2
Diffstat (limited to 'zen/win.h')
-rw-r--r--zen/win.h4
1 files changed, 4 insertions, 0 deletions
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"
bgstack15