From c14b7b970cca834a96b73918d9a54c049f8f7b0d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 11 Jul 2025 13:30:37 +0200 Subject: [PATCH] tweak macro name --- lib/asyn-thrdd.c | 4 ++-- lib/curl_threads.c | 4 ++-- lib/curl_threads.h | 6 +++--- tests/libtest/lib3207.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c index 2d0aaad6c1..a7ca8f9a13 100644 --- a/lib/asyn-thrdd.c +++ b/lib/asyn-thrdd.c @@ -202,7 +202,7 @@ err_exit: * For builds without ARES, but with USE_IPV6, create a resolver thread * and wait on it. */ -static CURL_THREAD_RESULT_T CURL_STDCALL getaddrinfo_thread(void *arg) +static CURL_THREAD_RETURN_T CURL_STDCALL getaddrinfo_thread(void *arg) { struct async_thrdd_addr_ctx *addr_ctx = arg; char service[12]; @@ -256,7 +256,7 @@ static CURL_THREAD_RESULT_T CURL_STDCALL getaddrinfo_thread(void *arg) /* * gethostbyname_thread() resolves a name and then exits. */ -static CURL_THREAD_RESULT_T CURL_STDCALL gethostbyname_thread(void *arg) +static CURL_THREAD_RETURN_T CURL_STDCALL gethostbyname_thread(void *arg) { struct async_thrdd_addr_ctx *addr_ctx = arg; bool all_gone; diff --git a/lib/curl_threads.c b/lib/curl_threads.c index 1b42dd839c..24561a6dde 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -59,7 +59,7 @@ static void *curl_thread_create_thunk(void *arg) return 0; } -curl_thread_t Curl_thread_create(CURL_THREAD_RESULT_T +curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T (CURL_STDCALL *func) (void *), void *arg) { curl_thread_t t = malloc(sizeof(pthread_t)); @@ -102,7 +102,7 @@ int Curl_thread_join(curl_thread_t *hnd) #elif defined(USE_THREADS_WIN32) -curl_thread_t Curl_thread_create(CURL_THREAD_RESULT_T +curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T (CURL_STDCALL *func) (void *), void *arg) { #if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE) diff --git a/lib/curl_threads.h b/lib/curl_threads.h index 6feeb24068..fb74561ffa 100644 --- a/lib/curl_threads.h +++ b/lib/curl_threads.h @@ -53,14 +53,14 @@ #endif #if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE) -#define CURL_THREAD_RESULT_T DWORD +#define CURL_THREAD_RETURN_T DWORD #else -#define CURL_THREAD_RESULT_T unsigned int +#define CURL_THREAD_RETURN_T unsigned int #endif #if defined(USE_THREADS_POSIX) || defined(USE_THREADS_WIN32) -curl_thread_t Curl_thread_create(CURL_THREAD_RESULT_T +curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T (CURL_STDCALL *func) (void *), void *arg); void Curl_thread_destroy(curl_thread_t *hnd); diff --git a/tests/libtest/lib3207.c b/tests/libtest/lib3207.c index c61d70ee25..b5fb4481d9 100644 --- a/tests/libtest/lib3207.c +++ b/tests/libtest/lib3207.c @@ -68,7 +68,7 @@ static size_t write_memory_callback(char *contents, size_t size, return realsize; } -static CURL_THREAD_RESULT_T CURL_STDCALL test_thread(void *ptr) +static CURL_THREAD_RETURN_T CURL_STDCALL test_thread(void *ptr) { struct Ctx *ctx = (struct Ctx *)ptr; CURLcode res = CURLE_OK;