From 64c5d0e1b06dfe1c04bb301924bab5bb96831de4 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Thu, 22 Dec 2022 16:33: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(-) (limited to 'libs/libcurl') diff --git a/libs/libcurl/src/config-win32.h b/libs/libcurl/src/config-win32.h index a8392aee06..3858ab5084 100644 --- a/libs/libcurl/src/config-win32.h +++ b/libs/libcurl/src/config-win32.h @@ -197,6 +197,10 @@ /* Define if you have the socket function. */ #define HAVE_SOCKET 1 +/* Define if libSSH2 is in use */ +#define USE_LIBSSH2 1 +#define HAVE_LIBSSH2_H 1 + /* Define if you have the strcasecmp function. */ #ifdef __MINGW32__ #define HAVE_STRCASECMP 1 @@ -615,6 +619,9 @@ Vista # define CURL_DISABLE_LDAP 1 #endif +/* if SSL is enabled */ +#define USE_OPENSSL 1 + /* Define to use the Windows crypto library. */ #if !defined(CURL_WINDOWS_APP) #define USE_WIN32_CRYPTO diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h index e395573e6b..ee42a7ed2f 100644 --- a/libs/libcurl/src/curl_setup.h +++ b/libs/libcurl/src/curl_setup.h @@ -61,16 +61,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_APP -# endif -# endif #endif /* -- cgit v1.2.3