diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
| commit | 40811e93f3fdf9342a9295369994012420fac548 (patch) | |
| tree | a8d85e094a9c21e10aa250f537c101fc2016a049 /contrib/libs/curl/lib/curl_threads.c | |
| parent | 30ebe5357bb143648c6be4d151ecd4944af81ada (diff) | |
| parent | 28a0c4a9f297064538a018c512cd9bbd00a1a35d (diff) | |
| download | ydb-40811e93f3fdf9342a9295369994012420fac548.tar.gz | |
Merge branch 'rightlib' into mergelibs-241016-1210
Diffstat (limited to 'contrib/libs/curl/lib/curl_threads.c')
| -rw-r--r-- | contrib/libs/curl/lib/curl_threads.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/contrib/libs/curl/lib/curl_threads.c b/contrib/libs/curl/lib/curl_threads.c index 6d73273f78..222d9364f0 100644 --- a/contrib/libs/curl/lib/curl_threads.c +++ b/contrib/libs/curl/lib/curl_threads.c @@ -35,9 +35,7 @@ #endif #include "curl_threads.h" -#ifdef BUILDING_LIBCURL #include "curl_memory.h" -#endif /* The last #include file should be: */ #include "memdebug.h" @@ -102,23 +100,18 @@ int Curl_thread_join(curl_thread_t *hnd) #elif defined(USE_THREADS_WIN32) -curl_thread_t Curl_thread_create( -#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP) - DWORD -#else - unsigned int -#endif - (CURL_STDCALL *func) (void *), +/* !checksrc! disable SPACEBEFOREPAREN 1 */ +curl_thread_t Curl_thread_create(unsigned int (CURL_STDCALL *func) (void *), void *arg) { -#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP) +#ifdef _WIN32_WCE typedef HANDLE curl_win_thread_handle_t; #else typedef uintptr_t curl_win_thread_handle_t; #endif curl_thread_t t; curl_win_thread_handle_t thread_handle; -#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP) +#ifdef _WIN32_WCE thread_handle = CreateThread(NULL, 0, func, arg, 0, NULL); #else thread_handle = _beginthreadex(NULL, 0, func, arg, 0, NULL); @@ -138,8 +131,7 @@ curl_thread_t Curl_thread_create( void Curl_thread_destroy(curl_thread_t hnd) { - if(hnd != curl_thread_t_null) - CloseHandle(hnd); + CloseHandle(hnd); } int Curl_thread_join(curl_thread_t *hnd) |