From 9cc35c54d23fb70751d6f44c9a5873f8ebb56e74 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 13 Dec 2020 16:46:24 +0100 Subject: [PATCH] Simplify libcurl initialization by using CURL_GLOBAL_ALL Using anything else is not recommended by libcurl documentation and it's not clear why would we need it, so just follow the official advice and pass CURL_GLOBAL_ALL. --- src/common/webrequest_curl.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/common/webrequest_curl.cpp b/src/common/webrequest_curl.cpp index c7e01c3e1c..e3f01b60be 100644 --- a/src/common/webrequest_curl.cpp +++ b/src/common/webrequest_curl.cpp @@ -537,11 +537,7 @@ wxVersionInfo wxWebSessionCURL::GetLibraryVersionInfo() // static void wxWebSessionCURL::InitializeCURL() { - long initFlags = CURL_GLOBAL_SSL; -#ifdef WIN32 - initFlags |= CURL_GLOBAL_WIN32; -#endif // WIN32 - if ( curl_global_init(initFlags) ) + if ( curl_global_init(CURL_GLOBAL_ALL) ) wxLogError("libcurl could not be initialized"); }