mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:01:41 +03:00
windows: target version macro tidy-ups
- autotools: stop checking for `WINVER` to detect thread-safety. To sync with implementation in `easy_lock.h` and with cmake. - replace numeric version with `_WIN32_WINNT_VISTA`. - `_WIN32_WINNT_VISTA` is always defined via `setup-win32.h`, don't check for it. Closes #17981
This commit is contained in:
parent
1074d6d727
commit
24f8442e6a
5 changed files with 5 additions and 7 deletions
|
|
@ -5382,7 +5382,7 @@ else
|
|||
AC_LANG_PROGRAM([[
|
||||
#include <windows.h>
|
||||
]],[[
|
||||
#if (WINVER < 0x600) && (_WIN32_WINNT < 0x600)
|
||||
#if (_WIN32_WINNT < 0x600)
|
||||
#error
|
||||
#endif
|
||||
]])
|
||||
|
|
|
|||
|
|
@ -142,8 +142,7 @@ void Curl_thread_destroy(curl_thread_t *hnd)
|
|||
|
||||
int Curl_thread_join(curl_thread_t *hnd)
|
||||
{
|
||||
#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \
|
||||
(_WIN32_WINNT < _WIN32_WINNT_VISTA)
|
||||
#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < _WIN32_WINNT_VISTA)
|
||||
int ret = (WaitForSingleObject(*hnd, INFINITE) == WAIT_OBJECT_0);
|
||||
#else
|
||||
int ret = (WaitForSingleObjectEx(*hnd, INFINITE, FALSE) == WAIT_OBJECT_0);
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@
|
|||
# define curl_mutex_t CRITICAL_SECTION
|
||||
# define curl_thread_t HANDLE
|
||||
# define curl_thread_t_null (HANDLE)0
|
||||
# if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \
|
||||
(_WIN32_WINNT < _WIN32_WINNT_VISTA)
|
||||
# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < _WIN32_WINNT_VISTA)
|
||||
# define Curl_mutex_init(m) InitializeCriticalSection(m)
|
||||
# else
|
||||
# define Curl_mutex_init(m) InitializeCriticalSectionEx(m, 0, 1)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ static CURLcode mac_ascii_to_idn(const char *in, char **out)
|
|||
#ifdef USE_WIN32_IDN
|
||||
/* using Windows kernel32 and normaliz libraries. */
|
||||
|
||||
#if (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x600) && \
|
||||
#if (!defined(_WIN32_WINNT) || _WIN32_WINNT < _WIN32_WINNT_VISTA) && \
|
||||
(!defined(WINVER) || WINVER < 0x600)
|
||||
WINBASEAPI int WINAPI IdnToAscii(DWORD dwFlags,
|
||||
const WCHAR *lpUnicodeCharStr,
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
|
||||
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 && \
|
||||
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_VISTA && \
|
||||
!defined(CURL_WINDOWS_UWP)
|
||||
# define HAVE_WIN_BCRYPTGENRANDOM
|
||||
# include <bcrypt.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue