@@ -136,11 +136,11 @@
 }
 
 static OF_INLINE bool
 of_tlskey_set(of_tlskey_t key, void *ptr)
 {
-	return !pthread_setspecific(key, ptr);
+	return (pthread_setspecific(key, ptr) == 0);
 }
 #elif defined(OF_WINDOWS)
 static OF_INLINE void *
 of_tlskey_get(of_tlskey_t key)
 {
@@ -171,11 +171,11 @@
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	*spinlock = 0;
 	return true;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-	return !pthread_spin_init(spinlock, 0);
+	return (pthread_spin_init(spinlock, 0) == 0);
 #else
 	return of_mutex_new(spinlock);
 #endif
 }
 
@@ -188,11 +188,11 @@
 		return true;
 	}
 
 	return false;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-	return !pthread_spin_trylock(spinlock);
+	return (pthread_spin_trylock(spinlock) == 0);
 #else
 	return of_mutex_trylock(spinlock);
 #endif
 }
 
@@ -209,11 +209,11 @@
 	while (!of_spinlock_trylock(spinlock))
 		of_thread_yield();
 
 	return true;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-	return !pthread_spin_lock(spinlock);
+	return (pthread_spin_lock(spinlock) == 0);
 #else
 	return of_mutex_lock(spinlock);
 #endif
 }
 
@@ -225,11 +225,11 @@
 
 	of_memory_barrier_release();
 
 	return ret;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-	return !pthread_spin_unlock(spinlock);
+	return (pthread_spin_unlock(spinlock) == 0);
 #else
 	return of_mutex_unlock(spinlock);
 #endif
 }
 
@@ -237,10 +237,10 @@
 of_spinlock_free(of_spinlock_t *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	return true;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
-	return !pthread_spin_destroy(spinlock);
+	return (pthread_spin_destroy(spinlock) == 0);
 #else
 	return of_mutex_free(spinlock);
 #endif
 }