Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stefan.werner@tangent-animation.com>2019-09-14 21:23:29 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2019-09-14 21:23:29 +0300
commit9d282d7a8d689a17ae58e94453ae99a41e91b701 (patch)
tree4c4bbd145df1c5b34d5779782964129742e30162 /source/blender/blenlib/BLI_threads.h
parentea70bd2abf7c178076a403dd071fcf593b79c20c (diff)
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.
Diffstat (limited to 'source/blender/blenlib/BLI_threads.h')
-rw-r--r--source/blender/blenlib/BLI_threads.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index 32b7f219605..b7ad6e543f1 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -30,7 +30,7 @@ extern "C" {
#include <pthread.h>
#ifdef __APPLE__
-# include <libkern/OSAtomic.h>
+# include <os/lock.h>
#endif
/* for tables, button in UI, etc */
@@ -103,7 +103,7 @@ void BLI_mutex_unlock(ThreadMutex *mutex);
/* Spin Lock */
#if defined(__APPLE__)
-typedef OSSpinLock SpinLock;
+typedef os_unfair_lock SpinLock;
#elif defined(_MSC_VER)
typedef volatile int SpinLock;
#else