romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-13 01:25:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

try moving win32 to CreateThread() API 3

Browse source
This commit is contained in:
Viktor Szakats 2025-09-03 23:14:13 +02:00
parent 01385ef1e9
commit 48e86bc03f
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/curl_setup.h
View file

@ -640,12 +640,6 @@
#endif
#endif
#ifdef _WIN32
#define CURL_THREAD_RETURN_T DWORD
#else
#define CURL_THREAD_RETURN_T unsigned int
#endif
/*
* Arg 2 type for gethostname in case it has not been defined in config file.
*/

2
lib/curl_threads.h
View file

@ -26,6 +26,7 @@
#include "curl_setup.h"
#ifdef USE_THREADS_POSIX
# define CURL_THREAD_RETURN_T unsigned int
# define CURL_STDCALL
# define curl_mutex_t pthread_mutex_t
# define curl_thread_t pthread_t *
@ -35,6 +36,7 @@
# define Curl_mutex_release(m) pthread_mutex_unlock(m)
# define Curl_mutex_destroy(m) pthread_mutex_destroy(m)
#elif defined(USE_THREADS_WIN32)
# define CURL_THREAD_RETURN_T DWORD
# define CURL_STDCALL WINAPI
# define curl_mutex_t CRITICAL_SECTION
# define curl_thread_t HANDLE

2
tests/libtest/lib3026.c
View file

@ -26,7 +26,7 @@
#define NUM_THREADS 100
#ifdef _WIN32
static CURL_THREAD_RETURN_T WINAPI t3026_run_thread(void *ptr)
static DWORD WINAPI t3026_run_thread(void *ptr)
{
CURLcode *result = ptr;

2
tests/server/sockfilt.c
View file

@ -412,7 +412,7 @@ struct select_ws_wait_data {
HANDLE signal; /* internal event to signal handle trigger */
HANDLE abort; /* internal event to abort waiting threads */
};
static CURL_THREAD_RETURN_T WINAPI select_ws_wait_thread(void *lpParameter)
static DWORD WINAPI select_ws_wait_thread(void *lpParameter)
{
struct select_ws_wait_data *data;
HANDLE signal, handle, handles[2];

4
tests/server/util.c
View file

@ -350,7 +350,7 @@ static SIGHANDLER_T old_sigbreak_handler = SIG_ERR;
#endif
#if defined(_WIN32) && !defined(CURL_WINDOWS_UWP) && !defined(UNDER_CE)
static CURL_THREAD_RETURN_T thread_main_id = 0;
static DWORD thread_main_id = 0;
static HANDLE thread_main_window = NULL;
static HWND hidden_main_window = NULL;
#endif
@ -487,7 +487,7 @@ static LRESULT CALLBACK main_window_proc(HWND hwnd, UINT uMsg,
}
/* Window message queue loop for hidden main window, details see above.
*/
static CURL_THREAD_RETURN_T WINAPI main_window_loop(void *lpParameter)
static DWORD WINAPI main_window_loop(void *lpParameter)
{
WNDCLASS wc;
BOOL ret;