X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d9a64523371fa019c4575bb400cbbc3a50ac9903..refs/heads/master:/bsd/pthread/pthread_priority.c

diff --git a/bsd/pthread/pthread_priority.c b/bsd/pthread/pthread_priority.c
index 53cda953a..199c5db69 100644
--- 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) {
@@ -45,14 +45,14 @@ _pthread_priority_normalize(pthread_priority_t pp)
 			pp |= _PTHREAD_PRIORITY_PRIORITY_MASK;
 		}
 		return pp & (_PTHREAD_PRIORITY_OVERCOMMIT_FLAG |
-				_PTHREAD_PRIORITY_FALLBACK_FLAG |
-				_PTHREAD_PRIORITY_QOS_CLASS_MASK |
-				_PTHREAD_PRIORITY_PRIORITY_MASK);
+		       _PTHREAD_PRIORITY_FALLBACK_FLAG |
+		       _PTHREAD_PRIORITY_QOS_CLASS_MASK |
+		       _PTHREAD_PRIORITY_PRIORITY_MASK);
 	}
 	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)) {
@@ -61,12 +61,12 @@ _pthread_priority_normalize_for_ipc(pthread_priority_t pp)
 			pp |= _PTHREAD_PRIORITY_PRIORITY_MASK;
 		}
 		return pp & (_PTHREAD_PRIORITY_QOS_CLASS_MASK |
-				_PTHREAD_PRIORITY_PRIORITY_MASK);
+		       _PTHREAD_PRIORITY_PRIORITY_MASK);
 	}
 	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,12 +75,12 @@ _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,
-			base_pp & _PTHREAD_PRIORITY_OVERCOMMIT_FLAG);
+	           base_pp & _PTHREAD_PRIORITY_OVERCOMMIT_FLAG);
 }