@@ -182,11 +182,11 @@
 static OF_INLINE bool
 of_spinlock_trylock(of_spinlock_t *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	if (of_atomic_int_cmpswap(spinlock, 0, 1)) {
-		of_memory_enter_barrier();
+		of_memory_barrier_enter();
 		return true;
 	}
 
 	return false;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
@@ -221,11 +221,11 @@
 of_spinlock_unlock(of_spinlock_t *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	bool ret = of_atomic_int_cmpswap(spinlock, 1, 0);
 
-	of_memory_leave_barrier();
+	of_memory_barrier_exit();
 
 	return ret;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return !pthread_spin_unlock(spinlock);
 #else