diff options
| author | dartraiden <wowemuh@gmail.com> | 2024-09-19 19:38:10 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2024-09-19 19:38:34 +0300 |
| commit | 1bf022db57fb4b93a0e356d3da82ff27e80a9c96 (patch) | |
| tree | 3cb895df63403417a2c88e54ba75e17df486d489 /libs | |
| parent | 487f6abca26f6b70d545d02e296ae6ca7e197882 (diff) | |
libcurl: pick up Miranda-specific commits
Diffstat (limited to 'libs')
| -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 17924e3dec..2e6261c745 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
@@ -474,6 +478,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_APP)
#define USE_WIN32_CRYPTO
diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h index dc56ee9d0b..7f63658cee 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_APP
-# endif
-# endif
#endif
/* Compatibility */
|