From abd66e56b3c0fd209dc225149c50acf46c3e1677 Mon Sep 17 00:00:00 2001 From: midipix Date: Mon, 29 Jan 2024 04:56:15 +0000 Subject: nt32|nt64: pthread_arch.h: adjust code to match musl-1.2.2 and later [while maintaining compatibility with older musl versions] [cf. musl commit 3a5b9ae7cf656648c80fe155a5239d9b4fb4c485] --- arch/nt32/pthread_arch.h | 4 ++++ arch/nt64/pthread_arch.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'arch') diff --git a/arch/nt32/pthread_arch.h b/arch/nt32/pthread_arch.h index f779af4..4d156b2 100644 --- a/arch/nt32/pthread_arch.h +++ b/arch/nt32/pthread_arch.h @@ -60,7 +60,11 @@ static inline struct pthread ** __psx_tlca(void) } +#ifdef __MUSL_PRE___GET_TP static inline struct pthread * __pthread_self(void) +#else +static inline struct pthread * __get_tp(void) +#endif { struct pthread ** ptlca; diff --git a/arch/nt64/pthread_arch.h b/arch/nt64/pthread_arch.h index 05188f3..c99da3a 100644 --- a/arch/nt64/pthread_arch.h +++ b/arch/nt64/pthread_arch.h @@ -62,7 +62,11 @@ static inline struct pthread ** __psx_tlca(void) } +#ifdef __MUSL_PRE___GET_TP static inline struct pthread * __pthread_self(void) +#else +static inline struct pthread * __get_tp(void) +#endif { struct pthread ** ptlca; -- cgit v1.2.3