From 9d282d7a8d689a17ae58e94453ae99a41e91b701 Mon Sep 17 00:00:00 2001
From: Stefan Werner <stefan.werner@tangent-animation.com>
Date: Sat, 14 Sep 2019 20:23:29 +0200
Subject: macOS: Replaced OSSpinLock with os_unfair_lock.

OSSplinLock is a deprecated API, os_unfair_lock is its successor.
This reduces the number of warnings when building on macOS.
---
 intern/cycles/util/util_thread.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'intern/cycles')

diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h
index 18ec5b32144..a9cfc309e0d 100644
--- a/intern/cycles/util/util_thread.h
+++ b/intern/cycles/util/util_thread.h
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef __APPLE__
-#  include <libkern/OSAtomic.h>
+#  include <os/lock.h>
 #endif
 
 #include "util/util_function.h"
@@ -72,17 +72,17 @@ class thread_spin_lock {
 #ifdef __APPLE__
   inline thread_spin_lock()
   {
-    spin_ = OS_SPINLOCK_INIT;
+    spin_ = OS_UNFAIR_LOCK_INIT;
   }
 
   inline void lock()
   {
-    OSSpinLockLock(&spin_);
+    os_unfair_lock_lock(&spin_);
   }
 
   inline void unlock()
   {
-    OSSpinLockUnlock(&spin_);
+    os_unfair_lock_unlock(&spin_);
   }
 #elif defined(_WIN32)
   inline thread_spin_lock()
@@ -128,7 +128,7 @@ class thread_spin_lock {
 #endif
  protected:
 #ifdef __APPLE__
-  OSSpinLock spin_;
+  os_unfair_lock spin_;
 #elif defined(_WIN32)
   CRITICAL_SECTION cs_;
 #else
-- 
cgit v1.2.3