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

Fix checking __MINGW64_VERSION_MAJOR for wxUSE_WEBREQUEST_WINHTTP

Browse Source 
It is not yet defined for setup.h, so check it in chkconf.h.
Fixes #19105
This commit is contained in:
Maarten Bent
2021-03-18 20:50:06 +01:00
parent 5bdd5e1432
commit 3cc48e2e56
6 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/setup.h.in
View File

@@ -691,11 +691,7 @@
#cmakedefine01 wxUSE_GRAPHICS_DIRECT2D #cmakedefine01 wxUSE_GRAPHICS_DIRECT2D
#endif #endif
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#cmakedefine01 wxUSE_WEBREQUEST_WINHTTP #cmakedefine01 wxUSE_WEBREQUEST_WINHTTP
#else
#cmakedefine01 wxUSE_WEBREQUEST_WINHTTP
#endif
#cmakedefine01 wxUSE_OLE #cmakedefine01 wxUSE_OLE

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

@@ -1650,11 +1650,7 @@
// //
// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1, // Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1,
// otherwise wxWebRequest won't be available at all. // otherwise wxWebRequest won't be available at all.
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#define wxUSE_WEBREQUEST_WINHTTP 1 #define wxUSE_WEBREQUEST_WINHTTP 1
#else
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Windows-only settings // Windows-only settings

5
include/wx/msw/chkconf.h
View File

@@ -235,6 +235,11 @@
# define wxUSE_ACTIVITYINDICATOR 0 # define wxUSE_ACTIVITYINDICATOR 0
#endif /* !wxUSE_ACTIVITYINDICATOR && !_MSC_VER */ #endif /* !wxUSE_ACTIVITYINDICATOR && !_MSC_VER */
/* MinGW-w64 (32 and 64 bit) has winhttp.h available, legacy MinGW does not. */
#if (!defined(_MSC_VER) && !defined(__MINGW64_VERSION_MAJOR))
#undef wxUSE_WEBREQUEST_WINHTTP
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
/* /*
Similarly, turn off wxUSE_WEBREQUEST if we can't enable it because we don't Similarly, turn off wxUSE_WEBREQUEST if we can't enable it because we don't
have any of its backends to allow the library to compile with the default have any of its backends to allow the library to compile with the default

4
include/wx/msw/setup.h
View File

@@ -1650,11 +1650,7 @@
// //
// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1, // Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1,
// otherwise wxWebRequest won't be available at all. // otherwise wxWebRequest won't be available at all.
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#define wxUSE_WEBREQUEST_WINHTTP 1 #define wxUSE_WEBREQUEST_WINHTTP 1
#else
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Windows-only settings // Windows-only settings

4
include/wx/msw/setup_inc.h
View File

@@ -44,11 +44,7 @@
// //
// Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1, // Recommended setting: 1, can be set to 0 if wxUSE_WEBREQUEST_CURL==1,
// otherwise wxWebRequest won't be available at all. // otherwise wxWebRequest won't be available at all.
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#define wxUSE_WEBREQUEST_WINHTTP 1 #define wxUSE_WEBREQUEST_WINHTTP 1
#else
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Windows-only settings // Windows-only settings

4
setup.h.in
View File

@@ -691,11 +691,7 @@
#define wxUSE_GRAPHICS_DIRECT2D 0 #define wxUSE_GRAPHICS_DIRECT2D 0
#endif #endif
#if defined(_MSC_VER) || defined(__MINGW64_VERSION_MAJOR)
#define wxUSE_WEBREQUEST_WINHTTP 0 #define wxUSE_WEBREQUEST_WINHTTP 0
#else
#define wxUSE_WEBREQUEST_WINHTTP 0
#endif
#define wxUSE_OLE 0 #define wxUSE_OLE 0