From b500788a3e6b0214fb6b80f7f60b59d8e8cd1bc7 Mon Sep 17 00:00:00 2001
From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Thu, 12 Dec 2024 16:50:56 +0000
Subject: [PATCH] Move lwpid_t hack into same place.

---
 bsd-user/linux/os-thread.h | 4 ----
 bsd-user/linux/qemu-os.h   | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/bsd-user/linux/os-thread.h b/bsd-user/linux/os-thread.h
index 49412e9d92..f1b93fe230 100644
--- a/bsd-user/linux/os-thread.h
+++ b/bsd-user/linux/os-thread.h
@@ -172,10 +172,6 @@ static inline abi_long do_freebsd_thr_set_name(abi_long tid, abi_ulong target_na
 #endif
 }
 
-#if defined(__linux__)
-typedef abi_long lwpid_t;
-#endif
-
 static inline abi_long do_freebsd_rtprio_thread(int function, lwpid_t lwpid,
         abi_ulong target_addr)
 {
diff --git a/bsd-user/linux/qemu-os.h b/bsd-user/linux/qemu-os.h
index 64c67d62f4..4e306fb586 100644
--- a/bsd-user/linux/qemu-os.h
+++ b/bsd-user/linux/qemu-os.h
@@ -41,6 +41,7 @@
 #undef SIGRTMIN
 #define SIGRTMIN __SIGRTMIN
 #define TARGET_STRERR_FILENO 2
+#define lwpid_t int32_t
 #define __lwpid_t int32_t
 #define __uintptr_t uintptr_t
 #define __LP64__ 1