@@ -107,11 +107,11 @@
 static OF_INLINE int
 OFSpinlockTryLock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	if (OFAtomicIntCompareAndSwap(spinlock, 0, 1)) {
-		of_memory_barrier_acquire();
+		OFAcquireMemoryBarrier();
 		return 0;
 	}
 
 	return EBUSY;
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
@@ -146,11 +146,11 @@
 OFSpinlockUnlock(OFSpinlock *spinlock)
 {
 #if defined(OF_HAVE_ATOMIC_OPS)
 	bool ret = OFAtomicIntCompareAndSwap(spinlock, 1, 0);
 
-	of_memory_barrier_release();
+	OFReleaseMemoryBarrier();
 
 	return (ret ? 0 : EINVAL);
 #elif defined(OF_HAVE_PTHREAD_SPINLOCKS)
 	return pthread_spin_unlock(spinlock);
 #else