diff options
| author | dartraiden <wowemuh@gmail.com> | 2025-02-17 17:19:41 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2025-02-17 17:19:54 +0300 |
| commit | a7830a6d0f3961c671d68c55d548a33d70e1146d (patch) | |
| tree | fccfff58dc755cde8e3f2269970d65b44186933d | |
| parent | ad2538d4732ca78575c6038d9d905382cf11e9b1 (diff) | |
libcurl: pick up Miranda-specific commits
| -rw-r--r-- | libs/libcurl/src/config-win32.h | 7 | ||||
| -rw-r--r-- | 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 5d06e89488..7543604b37 100644 --- a/libs/libcurl/src/config-win32.h +++ b/libs/libcurl/src/config-win32.h @@ -148,6 +148,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
+
#ifndef UNDER_CE
/* Define if you have the setlocale function. */
#define HAVE_SETLOCALE 1
@@ -457,6 +461,9 @@ Vista #define USE_WIN32_LDAP 1
#endif
+/* if SSL is enabled */
+#define USE_OPENSSL 1
+
/* Define to use the Windows crypto library. */
#ifndef CURL_WINDOWS_UWP
#define USE_WIN32_CRYPTO
diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h index bc863fbb97..1fd2b16c4e 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 <winapifamily.h>
-# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
- !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-# define CURL_WINDOWS_UWP
-# endif
-# endif
#endif
/* Compatibility */
|