Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxUSE_WINSOCK2 wxMSW option to include winsock2.h

Browse Source 
Including <winsock.h> and <winsock2.h> is incompatible and if the
application wants to use the latter, it may be convenient to define
wxUSE_WINSOCK2 when building wxWidgets instead of having to work around
winsock.h implicit inclusion from include/wx/msw/wrapwin.h.

Closes https://github.com/wxWidgets/wxWidgets/pull/1122
This commit is contained in:
Tomay
2019-01-10 05:07:39 +01:00
committed by Vadim Zeitlin
parent eaee931011
commit 8deb2cf0bb
11 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/android/setup.h
View File

@@ -1661,6 +1661,13 @@
// Recommended setting: 0, nobody uses .INI files any more
#define wxUSE_INICONF 0
// Set to 1 if you need to include <winsock2.h> over <winsock.h>
//
// Default is 0.
//
// Recommended setting: 0
#define wxUSE_WINSOCK2 0
// ----------------------------------------------------------------------------
// Generic versions of native controls
// ----------------------------------------------------------------------------