From 6e55e6942f54cadc31904d33b1056e98215092b3 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 30 Mar 2026 20:44:36 -0400 Subject: [PATCH] pthread: PTHREAD_RECURSIVE_MUTEX_INITIALIZER is non-POSIX. So add the _NP suffix like glibc does. Pointed out by sortie. --- headers/posix/pthread.h | 2 +- src/kits/app/TokenSpace.cpp | 2 +- src/system/libroot/posix/glibc/include/bits/libc-lock.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/headers/posix/pthread.h b/headers/posix/pthread.h index d3bed57fec..0a1e3fff3d 100644 --- a/headers/posix/pthread.h +++ b/headers/posix/pthread.h @@ -78,7 +78,7 @@ extern "C" { #define PTHREAD_MUTEX_INITIALIZER \ { PTHREAD_MUTEX_DEFAULT, 0, -42, -1, 0 } -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER \ +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ { PTHREAD_MUTEX_RECURSIVE, 0, -42, -1, 0 } #define PTHREAD_COND_INITIALIZER \ { 0, -42, NULL, 0, 0 } diff --git a/src/kits/app/TokenSpace.cpp b/src/kits/app/TokenSpace.cpp index fee9f60c85..4e065631d0 100644 --- a/src/kits/app/TokenSpace.cpp +++ b/src/kits/app/TokenSpace.cpp @@ -34,7 +34,7 @@ BTokenSpace::BTokenSpace() : fNextToken(1) { - fLock = (pthread_mutex_t)PTHREAD_RECURSIVE_MUTEX_INITIALIZER; + fLock = (pthread_mutex_t)PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; } diff --git a/src/system/libroot/posix/glibc/include/bits/libc-lock.h b/src/system/libroot/posix/glibc/include/bits/libc-lock.h index 8b965f5bb6..067c55a8bc 100644 --- a/src/system/libroot/posix/glibc/include/bits/libc-lock.h +++ b/src/system/libroot/posix/glibc/include/bits/libc-lock.h @@ -33,7 +33,6 @@ #define __pthread_mutex_lock pthread_mutex_lock #define __pthread_mutex_trylock pthread_mutex_trylock #define __pthread_mutex_unlock pthread_mutex_unlock -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE /* Mutex type. */