From 4d825c74d4a6d40d5b0d5e3612fcfdd67198b9a5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Fri, 1 Aug 2025 21:57:29 +0200
Subject: [PATCH] dedupe curl_win_thread_handle_t typedef into curl_setup.h

---
 lib/curl_setup.h        | 2 ++
 lib/curl_threads.c      | 5 -----
 tests/libtest/lib3026.c | 5 -----
 tests/server/sockfilt.c | 1 -
 tests/server/util.c     | 1 -
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 672f401466..01f91c0223 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -642,8 +642,10 @@
 
 #if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
 #define CURL_THREAD_RETURN_T DWORD
+typedef HANDLE curl_win_thread_handle_t;
 #else
 #define CURL_THREAD_RETURN_T unsigned int
+typedef uintptr_t curl_win_thread_handle_t;
 #endif
 
 /*
diff --git a/lib/curl_threads.c b/lib/curl_threads.c
index 2750f5ad9f..6fef025182 100644
--- a/lib/curl_threads.c
+++ b/lib/curl_threads.c
@@ -133,11 +133,6 @@ int Curl_thread_cancel(curl_thread_t *hnd)
 curl_thread_t Curl_thread_create(CURL_THREAD_RETURN_T
                                  (CURL_STDCALL *func) (void *), void *arg)
 {
-#if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
-  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(CURL_WINDOWS_UWP) || defined(UNDER_CE)
diff --git a/tests/libtest/lib3026.c b/tests/libtest/lib3026.c
index d75b27d656..3e95ebec19 100644
--- a/tests/libtest/lib3026.c
+++ b/tests/libtest/lib3026.c
@@ -40,11 +40,6 @@ static CURL_THREAD_RETURN_T __stdcall t3026_run_thread(void *ptr)
 
 static CURLcode test_lib3026(const char *URL)
 {
-#if defined(CURL_WINDOWS_UWP) || defined(UNDER_CE)
-  typedef HANDLE curl_win_thread_handle_t;
-#else
-  typedef uintptr_t curl_win_thread_handle_t;
-#endif
   CURLcode results[NUM_THREADS];
   curl_win_thread_handle_t thread_handles[NUM_THREADS];
   unsigned tid_count = NUM_THREADS, i;
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index c8b21beee9..7867b66d59 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -557,7 +557,6 @@ static unsigned int WINAPI select_ws_wait_thread(void *lpParameter)
 
 static HANDLE select_ws_wait(HANDLE handle, HANDLE signal, HANDLE abort)
 {
-  typedef uintptr_t curl_win_thread_handle_t;
   struct select_ws_wait_data *data;
   curl_win_thread_handle_t thread;
 
diff --git a/tests/server/util.c b/tests/server/util.c
index dc03f49e8a..f35f6fa4fb 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -624,7 +624,6 @@ void install_signal_handlers(bool keep_sigalrm)
 
 #if !defined(CURL_WINDOWS_UWP) && !defined(UNDER_CE)
   {
-    typedef uintptr_t curl_win_thread_handle_t;
     curl_win_thread_handle_t thread;
     thread = _beginthreadex(NULL, 0, &main_window_loop,
                             (void *)GetModuleHandle(NULL), 0, &thread_main_id);