solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Enable Winsock 2 and IPv6 build options by default

Browse source 
In addition to linking with Winsock 2, also use winsock2.h.

This allows to turn on IPv6 support on by default under MSW, so turn it
on under Unix too for consistency.

Predefine _WINSOCK_DEPRECATED_NO_WARNINGS to avoid warnings about
deprecated (but still available and very unlikely to be ever removed)
Winsock 1 functions that we still use.
This commit is contained in:
Vadim Zeitlin 2021-04-24 18:03:04 +01:00
parent 1dfc18a004
commit bf5090bcf3
10 changed files with 32 additions and 55 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