Changeset 5277 for pjproject

Timestamp:

Apr 13, 2016 6:24:48 AM (9 years ago)

Author:

riza

Message:

Fixed #1912: Build Error on Alpine linux (musl libc).

Location:

pjproject/trunk

Files:

• pjlib/src/pj/os_core_unix.c (modified) (2 diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/os_core_unix.c

@@ -1126 +1126 @@
 #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)
@@ -1136 +1136 @@
 #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)

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -1137 +1137 @@
         return;
     }
-    tp.__sched_priority = max_prio;
+    tp.sched_priority = max_prio;
 
     rc = sched_setscheduler(0, POLICY, &tp);
@@ -1146 +1146 @@
 
     PJ_LOG(4, (THIS_FILE, "New process policy=%d, priority=%d",
-              policy, tp.__sched_priority));
+              policy, tp.sched_priority));
 
     /*
@@ -1159 +1159 @@
 
     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);
@@ -1172 +1172 @@
 
     PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d",
-              policy, tp.__sched_priority));
+              policy, tp.sched_priority));
 }