diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-04-13 06:24:48 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-04-13 06:24:48 +0000 |
| commit | eeae4551a44f7777418cc927f150459fe81275f2 (patch) | |
| tree | 8fb9ab21dacc05e30c661d472bf9bf32a197f6ee | |
| parent | 582b6f137ed7fabe01ab3368929aaa337751ee8d (diff) | |
Fixed #1912: Build Error on Alpine linux (musl libc).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5277 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/src/pj/os_core_unix.c | 4 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c index 1a9fedd0..ebfe8434 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 <ptorre@zetron.com>: diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 8e74c338..258d4765 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1136,7 +1136,7 @@ static void boost_priority(void) PJ_RETURN_OS_ERROR(rc)); return; } - tp.__sched_priority = max_prio; + tp.sched_priority = max_prio; rc = sched_setscheduler(0, POLICY, &tp); if (rc != 0) { @@ -1145,7 +1145,7 @@ static void boost_priority(void) } PJ_LOG(4, (THIS_FILE, "New process policy=%d, priority=%d", - policy, tp.__sched_priority)); + policy, tp.sched_priority)); /* * Adjust thread scheduling algorithm and priority @@ -1158,10 +1158,10 @@ static void boost_priority(void) } PJ_LOG(4, (THIS_FILE, "Old thread policy=%d, priority=%d", - policy, tp.__sched_priority)); + policy, tp.sched_priority)); policy = POLICY; - tp.__sched_priority = max_prio; + tp.sched_priority = max_prio; rc = pthread_setschedparam(pthread_self(), policy, &tp); if (rc != 0) { @@ -1171,7 +1171,7 @@ static void boost_priority(void) } PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d", - policy, tp.__sched_priority)); + policy, tp.sched_priority)); } #else |