diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-22 14:50:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-22 14:50:17 +0300 |
| commit | 5d2b3a966eb2bce71c1effb4c79cf0f23c1d5bf5 (patch) | |
| tree | 3d16bf1c7727eb29739863bf788200199bf9200a /source/blender/blenlib | |
| parent | 4e6f86942cd4f99e73e81e3cc7fa00aa16932986 (diff) | |
| parent | 69b5165902d3e433af5b3ece633903162cbc292a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index fbb64f3ece2..2f961701801 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -508,14 +508,16 @@ void BLI_spin_unlock(SpinLock *spin) #endif } -void BLI_spin_end(SpinLock *spin) +#if defined(__APPLE__) || defined(_MSC_VER) +void BLI_spin_end(SpinLock *UNUSED(spin)) { -#if defined(__APPLE__) -#elif defined(_MSC_VER) +} #else +void BLI_spin_end(SpinLock *spin) +{ pthread_spin_destroy(spin); -#endif } +#endif /* Read/Write Mutex Lock */ |