@@ -31,11 +31,11 @@
 
 #ifdef OF_HAVE_THREADS
 OF_CONSTRUCTOR()
 {
 	for (size_t i = 0; i < NUM_SPINLOCKS; i++)
-		if (!of_spinlock_new(&spinlocks[i]))
+		if (of_spinlock_new(&spinlocks[i]) != 0)
 			OBJC_ERROR("Failed to initialize spinlocks!");
 }
 #endif
 
 id
@@ -44,15 +44,15 @@
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(ptr);
 
-		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]) == 0);
 		@try {
 			return [[*ptr retain] autorelease];
 		} @finally {
-			OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]));
+			OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]) == 0);
 		}
 #else
 		return [[*ptr retain] autorelease];
 #endif
 	}
@@ -67,11 +67,11 @@
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(ptr);
 
-		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]) == 0);
 		@try {
 #endif
 			id old = *ptr;
 
 			switch (copy) {
@@ -86,11 +86,11 @@
 			}
 
 			[old release];
 #ifdef OF_HAVE_THREADS
 		} @finally {
-			OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]));
+			OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]) == 0);
 		}
 #endif
 
 		return;
 	}
@@ -119,15 +119,15 @@
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(src);
 
-		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]) == 0);
 #endif
 		memcpy(dest, src, size);
 #ifdef OF_HAVE_THREADS
-		OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]) == 0);
 #endif
 
 		return;
 	}
 
@@ -140,15 +140,15 @@
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(src);
 
-		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]) == 0);
 #endif
 		memcpy(dest, src, size);
 #ifdef OF_HAVE_THREADS
-		OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]));
+		OF_ENSURE(of_spinlock_unlock(&spinlocks[hash]) == 0);
 #endif
 
 		return;
 	}