diff options
| author | dartraiden <wowemuh@gmail.com> | 2023-02-16 01:10:57 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2023-02-16 01:11:24 +0300 |
| commit | 053096cafe8f239f48baaf6778885793451eb948 (patch) | |
| tree | c571bb82b1d50e50b0c4f657f88ab226fe05e8e6 | |
| parent | 17f79d251994ad4abea313739a5322f7b1352d91 (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 17a9a1d048..f014d4746c 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 028d4c4428..f0633ddfff 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 <winapifamily.h>
-# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
- !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-# define CURL_WINDOWS_APP
-# endif
-# endif
#endif
/*
|