From 22e876d0dbc4d90a89cb576c7b9422d2b3164eb5 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 6 Nov 2024 20:57:46 +0300 Subject: libcurl: pick up Miranda-specific commits --- libs/libcurl/src/config-win32.h | 7 +++++++ libs/libcurl/src/curl_setup.h | 10 ---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/libcurl/src/config-win32.h b/libs/libcurl/src/config-win32.h index 5dc986a0ee..7b4c9d2748 100644 --- a/libs/libcurl/src/config-win32.h +++ b/libs/libcurl/src/config-win32.h @@ -149,6 +149,10 @@ /* Define if you have the select function. */ #define HAVE_SELECT 1 +/* Define if libSSH2 is in use */ +#define USE_LIBSSH2 1 +#define HAVE_LIBSSH2_H 1 + /* Define if you have the setlocale function. */ #define HAVE_SETLOCALE 1 @@ -477,6 +481,9 @@ Vista #define USE_WIN32_LDAP 1 #endif +/* if SSL is enabled */ +#define USE_OPENSSL 1 + /* Define to use the Windows crypto library. */ #if !defined(CURL_WINDOWS_UWP) #define USE_WIN32_CRYPTO diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h index e10383975b..dc4a4553aa 100644 --- a/libs/libcurl/src/curl_setup.h +++ b/libs/libcurl/src/curl_setup.h @@ -102,16 +102,6 @@ # ifndef NOGDI # define NOGDI # endif -/* Detect Windows App environment which has a restricted access - * to the Win32 APIs. */ -# if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \ - defined(WINAPI_FAMILY) -# include -# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \ - !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -# define CURL_WINDOWS_UWP -# endif -# endif #endif /* Compatibility */ -- cgit v1.2.3