@@ -654,20 +654,20 @@
 #else
 # error No atomic operations available!
 #endif
 }
 
-static OF_INLINE BOOL
+static OF_INLINE bool
 of_atomic_cmpswap_int(volatile int *p, int o, int n)
 {
 #if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
-		return YES;
+		return true;
 	}
 
-	return NO;
+	return false;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	int r;
 
 	__asm__ (
 	    "xorl	%0, %0\n\t"
@@ -688,20 +688,20 @@
 #else
 # error No atomic operations available!
 #endif
 }
 
-static OF_INLINE BOOL
+static OF_INLINE bool
 of_atomic_cmpswap_32(volatile int32_t *p, int32_t o, int32_t n)
 {
 #if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
-		return YES;
+		return true;
 	}
 
-	return NO;
+	return false;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	int r;
 
 	__asm__ (
 	    "xorl	%0, %0\n\t"
@@ -722,20 +722,20 @@
 #else
 # error No atomic operations available!
 #endif
 }
 
-static OF_INLINE BOOL
+static OF_INLINE bool
 of_atomic_cmpswap_ptr(void* volatile *p, void *o, void *n)
 {
 #if !defined(OF_HAVE_THREADS)
 	if (*p == o) {
 		*p = n;
-		return YES;
+		return true;
 	}
 
-	return NO;
+	return false;
 #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
 	int r;
 
 	__asm__ (
 	    "xorl	%0, %0\n\t"