diff options
| author | dartraiden <wowemuh@gmail.com> | 2024-01-31 18:59:44 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2024-01-31 19:00:02 +0300 |
| commit | 4ce9ed24b5fabd39d82aaf81147377f3906dec3b (patch) | |
| tree | 1d0918bb92c39c26d6e3011561d7fee566976941 | |
| parent | 1e6eb7b2eec5520b510b4437a6f13578f0acddc6 (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 2514a09c33..ce440ddda3 100644 --- a/libs/libcurl/src/config-win32.h +++ b/libs/libcurl/src/config-win32.h @@ -158,6 +158,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. */
#if defined(__MINGW32__)
#define HAVE_STRCASECMP 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 f907684b2d..2c53b742b2 100644 --- a/libs/libcurl/src/curl_setup.h +++ b/libs/libcurl/src/curl_setup.h @@ -60,16 +60,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
/*
|