Add wxUSE_WINSOCK2 wxMSW option to include winsock2.h

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

View File

@@ -348,6 +348,9 @@ compilers. See also wxUSE_NO_MANIFEST.}
@itemdef{wxUSE_WIN_METAFILES_ALWAYS, Use wxMetaFile even when wxUSE_ENH_METAFILE=1.}
@itemdef{wxUSE_WINRT, Enable WinRT support.}
@itemdef{wxUSE_WXDIB, Use wxDIB class.}
@itemdef{wxUSE_WINSOCK2, Include @c <winsock2.h> instead of @c <winsock.h>.
Turned on automatically if ::wxUSE_IPV6 is on (this option is new since
wxWidgets 3.1.3).}
@endDefList