diff options
author | Brad King <brad.king@kitware.com> | 2023-10-12 19:29:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-10-12 19:29:20 (GMT) |
commit | df4efb72e4225dc3fd4f32313bc8b19122a98f66 (patch) | |
tree | dbbb93a136f4f44184cbab061b03489379ef717c /Utilities/cmcurl/lib/curl_threads.h | |
parent | 8f6a6b02e59c112dbe971adca4f25938903828ea (diff) | |
parent | e6a6c1abc1e6b6e3ca9fa77947279509b55e2b01 (diff) | |
download | CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.zip CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.tar.gz CMake-df4efb72e4225dc3fd4f32313bc8b19122a98f66.tar.bz2 |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2023-10-11 (d755a5f7)
Issue: #25329
Diffstat (limited to 'Utilities/cmcurl/lib/curl_threads.h')
-rw-r--r-- | Utilities/cmcurl/lib/curl_threads.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/curl_threads.h b/Utilities/cmcurl/lib/curl_threads.h index facbc73..27a478d 100644 --- a/Utilities/cmcurl/lib/curl_threads.h +++ b/Utilities/cmcurl/lib/curl_threads.h @@ -40,8 +40,7 @@ # 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) || \ - (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) + (_WIN32_WINNT < _WIN32_WINNT_VISTA) # define Curl_mutex_init(m) InitializeCriticalSection(m) # else # define Curl_mutex_init(m) InitializeCriticalSectionEx(m, 0, 1) |