@@ -14,12 +14,10 @@
  * file.
  */
 
 #include <libkern/OSAtomic.h>
 
-OF_ASSUME_NONNULL_BEGIN
-
 static OF_INLINE int
 of_atomic_int_add(volatile int *_Nonnull p, int i)
 {
 	return OSAtomicAdd32(i, p);
 }
@@ -140,35 +138,21 @@
 {
 	return OSAtomicCompareAndSwapPtr(o, n, p);
 }
 
 static OF_INLINE void
-of_memory_barrier_sync(void)
+of_memory_barrier(void)
 {
 	OSMemoryBarrier();
 }
 
 static OF_INLINE void
-of_memory_barrier_enter(void)
+of_memory_barrier_acquire(void)
 {
 	OSMemoryBarrier();
 }
 
 static OF_INLINE void
-of_memory_barrier_exit(void)
+of_memory_barrier_release(void)
 {
 	OSMemoryBarrier();
 }
-
-static OF_INLINE void
-of_memory_barrier_producer(void)
-{
-	OSMemoryBarrier();
-}
-
-static OF_INLINE void
-of_memory_barrier_consumer(void)
-{
-	OSMemoryBarrier();
-}
-
-OF_ASSUME_NONNULL_END