From ba1057d74aac6c2dde5477bd6a2deea79f14962c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Sat, 12 Mar 2016 15:19:34 +0100 Subject: [PATCH 1/2] Use mutex types compatible with musl (fixes musl build) PTHREAD_MUTEX_FAST_NP and PTHREAD_MUTEX_RECURSIVE_NP are not defined in the musl C library. Use values that map to the same mutex type in GNU libc and uClibc-ng. Fixes the following build errors when building with musl: ../src/pj/os_core_unix.c: In function 'init_mutex': ../src/pj/os_core_unix.c:1128:40: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function) rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); ^ ../src/pj/os_core_unix.c:1128:40: note: each undeclared identifier is reported only once for each function it appears in ../src/pj/os_core_unix.c:1138:40: error: 'PTHREAD_MUTEX_RECURSIVE_NP' undeclared (first use in this function) rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); ^ Original patch: http://git.alpinelinux.org/cgit/aports/plain/main/pjproject/musl-fixes.patch Signed-off-by: Luca Ceresoli --- pjlib/src/pj/os_core_unix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c index 1c87b2f..f08ba27 100644 --- a/pjlib/src/pj/os_core_unix.c +++ b/pjlib/src/pj/os_core_unix.c @@ -1125,7 +1125,7 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name, int type) if (type == PJ_MUTEX_SIMPLE) { #if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); + rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE) /* Nothing to do, default is simple */ @@ -1135,7 +1135,7 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name, int type) } else { #if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE) // Phil Torre : -- 1.9.1