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

Merge branch 'winsock-2'

Browse Source 
Use WinSock 2 rather than 1.1 by default and also enable IPv6 support,
requiring WinSock 2, by default now that it can be done.

See https://github.com/wxWidgets/wxWidgets/pull/2335

Closes #15562.
This commit is contained in:
Vadim Zeitlin
2021-04-26 15:07:13 +01:00
parent eef5fa245b bf5090bcf3
commit 86d1a25624
678 changed files with 3031 additions and 3083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/gtk/setup.h
View File

@@ -562,14 +562,10 @@
// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
//
// Notice that currently setting this option under Windows will result in
// programs which can only run on recent OS versions (with ws2_32.dll
// installed) which is why it is disabled by default.
//
// Default is 1.
//
// Recommended setting: 1 if you need IPv6 support
#define wxUSE_IPV6 0
// Recommended setting: 1.
#define wxUSE_IPV6 1
// Set to 1 to enable virtual file systems (required by wxHTML)
#define wxUSE_FILESYSTEM 1
@@ -1772,12 +1768,12 @@
// 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>
// Set to 0 if you need to include <winsock.h> rather than <winsock2.h>
//
// Default is 0.
// Default is 1.
//
// Recommended setting: 0, set to 1 automatically if wxUSE_IPV6 is 1.
#define wxUSE_WINSOCK2 0
// Recommended setting: 1, required to be 1 if wxUSE_IPV6 is 1.
#define wxUSE_WINSOCK2 1
// ----------------------------------------------------------------------------
// Generic versions of native controls