xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / pthread / pthread_priority.c

diff --git a/bsd/pthread/pthread_priority.c b/bsd/pthread/pthread_priority.c
index 05fef52c653a3caf269a885094f09678b0b9b52b..199c5db69d20badb4d464069b040bd3d58fcac2c 100644 (file)
--- a/bsd/pthread/pthread_priority.c
+++ b/bsd/pthread/pthread_priority.c
@@ -33,7 +33,7 @@
 #define QOS_MIN_RELATIVE_PRIORITY -15
 #endif
 
-pthread_priority_t
+pthread_priority_compact_t
 _pthread_priority_normalize(pthread_priority_t pp)
 {
        if (pp & _PTHREAD_PRIORITY_EVENT_MANAGER_FLAG) {
@@ -52,7 +52,7 @@ _pthread_priority_normalize(pthread_priority_t pp)
        return _pthread_unspecified_priority();
 }
 
-pthread_priority_t
+pthread_priority_compact_t
 _pthread_priority_normalize_for_ipc(pthread_priority_t pp)
 {
        if (_pthread_priority_has_qos(pp)) {
@@ -66,7 +66,7 @@ _pthread_priority_normalize_for_ipc(pthread_priority_t pp)
        return _pthread_unspecified_priority();
 }
 
-pthread_priority_t
+pthread_priority_compact_t
 _pthread_priority_combine(pthread_priority_t base_pp, thread_qos_t qos)
 {
        if (base_pp & _PTHREAD_PRIORITY_EVENT_MANAGER_FLAG) {
@@ -75,10 +75,10 @@ _pthread_priority_combine(pthread_priority_t base_pp, thread_qos_t qos)
 
        if (base_pp & _PTHREAD_PRIORITY_FALLBACK_FLAG) {
                if (!qos) {
-                       return base_pp;
+                       return (pthread_priority_compact_t)base_pp;
                }
        } else if (qos < _pthread_priority_thread_qos(base_pp)) {
-               return base_pp;
+               return (pthread_priority_compact_t)base_pp;
        }
 
        return _pthread_priority_make_from_thread_qos(qos, 0,