@@ -51,13 +51,13 @@
 #endif
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 OF_CONSTRUCTOR()
 {
-	OF_ENSURE(of_tlskey_new(&objectsKey));
-	OF_ENSURE(of_tlskey_new(&countKey));
-	OF_ENSURE(of_tlskey_new(&sizeKey));
+	OF_ENSURE(of_tlskey_new(&objectsKey) == 0);
+	OF_ENSURE(of_tlskey_new(&countKey) == 0);
+	OF_ENSURE(of_tlskey_new(&sizeKey) == 0);
 }
 #endif
 
 void *
 objc_autoreleasePoolPush()
@@ -98,17 +98,17 @@
 		free(objects);
 		objects = NULL;
 #if defined(OF_HAVE_COMPILER_TLS) || !defined(OF_HAVE_THREADS)
 		size = 0;
 #else
-		OF_ENSURE(of_tlskey_set(objectsKey, objects));
-		OF_ENSURE(of_tlskey_set(sizeKey, (void *)0));
+		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
+		OF_ENSURE(of_tlskey_set(sizeKey, (void *)0) == 0);
 #endif
 	}
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	OF_ENSURE(of_tlskey_set(countKey, (void *)count));
+	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
 #endif
 }
 
 id
 _objc_rootAutorelease(id object)
@@ -127,18 +127,18 @@
 
 		OF_ENSURE((objects =
 		    realloc(objects, size * sizeof(id))) != NULL);
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-		OF_ENSURE(of_tlskey_set(objectsKey, objects));
-		OF_ENSURE(of_tlskey_set(sizeKey, (void *)size));
+		OF_ENSURE(of_tlskey_set(objectsKey, objects) == 0);
+		OF_ENSURE(of_tlskey_set(sizeKey, (void *)size) == 0);
 #endif
 	}
 
 	objects[count++] = object;
 
 #if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	OF_ENSURE(of_tlskey_set(countKey, (void *)count));
+	OF_ENSURE(of_tlskey_set(countKey, (void *)count) == 0);
 #endif
 
 	return object;
 }